[transmageddon] autotools fixes from Javier Jardón



commit 262d5e2d138ebb190943b9d39612d2e4c1ac1c0e
Author: Christian Fredrik Kalager Schaller <christian schaller collabora co uk>
Date:   Thu Apr 14 23:32:19 2011 +0100

    autotools fixes from Javier Jardón

 Makefile.am  |    2 +-
 configure.ac |   32 ++++++++++++++------------------
 2 files changed, 15 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2060183..65b9aec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I common/m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS	= bin src common po presets profiles
 
diff --git a/configure.ac b/configure.ac
index 951b1a2..733df29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,22 @@
-AC_PREREQ(2.52)
+AC_PREREQ([2.63])
 
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(transmageddon, 0.16,
-    http://www.linuxrising.org/transmageddon,
-    transmageddon)
+AC_INIT([transmageddon],
+        [0.16],
+        [https://bugzilla.gnome.org/enter_bug.cgi?product=transmageddon],
+        [transmageddon],
+        [http://www.linuxrising.org/transmageddon])
+
+AC_CONFIG_SRCDIR([src/transmageddon.py])
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl initialize automake
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz])
 
 dnl enable maintainer mode option
-AM_MAINTAINER_MODE
-
-dnl define PACKAGE_VERSION_* variables
-AS_VERSION
-
-dnl can autoconf find the source ?
-AC_CONFIG_SRCDIR([src/transmageddon.py])
-
+AM_MAINTAINER_MODE([enable])
 
 AC_SUBST_FILE(AUTHORS)
 AUTHORS=$srcdir/AUTHORS
@@ -35,9 +33,6 @@ AC_SUBST(PYGTK_REQ, 2.8.0)
 AC_SUBST(PYGST_REQ, 0.10.6)
 AC_SUBST(GST_REQ, 0.10.13.1)
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4")
-
 AS_AC_EXPAND(LIBDIR, $libdir)
 AC_MSG_NOTICE(Storing library files in $LIBDIR)
 
@@ -67,7 +62,7 @@ AC_SUBST(CONFIGURED_PYTHONPATH)
 AC_CONFIG_FILES([bin/transmageddon], [chmod +x bin/transmageddon])
 
 dnl output stuff
-AC_OUTPUT(
+AC_CONFIG_FILES([
 Makefile
 bin/Makefile
 common/Makefile
@@ -79,4 +74,5 @@ profiles/Makefile
 po/Makefile.in
 transmageddon.spec
 transmageddon.desktop.in
-)
+])
+AC_OUTPUT



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]