aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2011-08-03 16:28:38 +0100
committerJavier Jardón <javier.jardon@codethink.co.uk>2011-08-03 16:28:38 +0100
commitc9394c71e5520deb4a26831d128a243b41ceae94 (patch)
tree994c65f623e09d06aab88cad06d09cfa86989262
parent66af84609f70b6697aa3b42fc026384541cc05ce (diff)
downloadayatana-ido-c9394c71e5520deb4a26831d128a243b41ceae94.tar.gz
ayatana-ido-c9394c71e5520deb4a26831d128a243b41ceae94.tar.bz2
ayatana-ido-c9394c71e5520deb4a26831d128a243b41ceae94.zip
configure.ac: Update autotools config a bit
Replace deprecated autotools macros Use new libtool syntax
-rw-r--r--configure.ac19
1 files changed, 12 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index c83a15a..3694e3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,16 +14,18 @@ m4_define([ido_interface_age], [0])
m4_define([ido_binary_age],
[m4_eval(100 * ido_minor_version + ido_micro_version)])
-AC_PREREQ(2.59)
+AC_PREREQ([2.64])
AC_INIT([ido],
[ido_version],
- [https://bugs.launchpad.net/avani])
+ [http://bugs.launchpad.net/ido],
+ [ido],
+ [http://launchpad.net/ido])
+
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/libido.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_CONFIG_HEADER([config.h])
-
AM_INIT_AUTOMAKE([1.11 foreign])
AM_SILENT_RULES([yes])
@@ -55,8 +57,11 @@ dnl ===========================================================================
# Checks for programs
AC_PROG_CC
AM_PROG_CC_C_O
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
+
AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
PKG_PROG_PKG_CONFIG
@@ -97,7 +102,7 @@ AC_SUBST(GCC_FLAGS)
# use strict compiler flags only on development releases
m4_define([maintainer_flags_default], [m4_if(m4_eval(ido_minor_version % 2), [1], [yes], [no])])
AC_ARG_ENABLE([maintainer-flags],
- [AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@],
+ [AS_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@],
[Use strict compiler flags @<:@default=no@:>@])],
[],
[enable_maintainer_flags=maintainer_flags_default])