summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-10-20 09:15:46 (GMT)
committerJavier Jardón <jjardon@gnome.org>2010-10-20 09:22:57 (GMT)
commit1c352d31231a98cf91423b45faa413da57343122 (patch)
treeb17d72cfde33edb6b118712742c156abc59feee1
parentfdaa71595c216c6ccd23bd97f8bef45bee973258 (diff)
downloadgedit-collaboration-1c352d31231a98cf91423b45faa413da57343122.tar.gz
gedit-collaboration-1c352d31231a98cf91423b45faa413da57343122.tar.xz
Modernize autotools configuration
New requirements: autoconf >= 2.64 automake >= 1.11 libtool >= 2.2 intltool >= 0.41
-rw-r--r--Makefile.am4
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac30
3 files changed, 19 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index 824f06d..97db8ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = src data po
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = src data po
EXTRA_DIST = \
autogen.sh \
diff --git a/autogen.sh b/autogen.sh
index 774eb4c..2931b21 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
exit 1
}
-ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 34624be..e930cac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,31 +1,32 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
+AC_PREREQ([2.64])
-AC_INIT(gedit-collaboration, 0.1)
+AC_INIT([gedit-collaboration],
+ [0.1],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=gedit],
+ [gedit-collaboration],
+ [http://projects.gnome.org/gedit/])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src])
AC_CONFIG_MACRO_DIR([m4])
AC_PREFIX_PROGRAM([gedit])
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip])
-
-AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
-AC_CONFIG_HEADERS([config.h])
-AC_DISABLE_STATIC
+AM_SILENT_RULES([yes])
-IT_PROG_INTLTOOL([0.35.0])
-AC_PROG_LIBTOOL
-
-AC_ISC_POSIX
+# Check for programs
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
-dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
+
dnl check for win32 platform
AC_MSG_CHECKING([for some Win32 platform])
@@ -44,6 +45,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
dnl ================================================================
dnl Gettext stuff.
dnl ================================================================
+IT_PROG_INTLTOOL([0.41.0])
GETTEXT_PACKAGE=geditcollaboration
AC_SUBST(GETTEXT_PACKAGE)