[libbluray-devel] build: centralize automake options within configure.ac

[Diego Elio Pettenò]

libbluray | branch: master | Diego Elio Pettenò <flameeyes at flameeyes.eu> | Thu Feb 14 17:27:05 2013 -0800| [ba8b1ec8beee51ddb8932100105e243ba422bccd] | committer: Diego Elio Pettenò

build: centralize automake options within configure.ac

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=ba8b1ec8beee51ddb8932100105e243ba422bccd
---

 Makefile.am  |    4 ----
 configure.ac |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0f61065..454ed37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,4 @@ EXTRA_DIST=bootstrap doc COPYING player_wrappers README.txt ChangeLog
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-AUTOMAKE_OPTIONS = \
-	dist-bzip2 \
-	no-dist-gzip
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-bdjava
diff --git a/configure.ac b/configure.ac
index e61353a..8c567a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libblur
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([foreign tar-ustar])
+AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2 no-dist-gzip])
 AC_CONFIG_HEADERS(config.h)
 
 case "${host_os}" in