From f8529b97f899fd2224bc15b94cc9df9bfd6015bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 13 Sep 2011 16:13:41 +0100 Subject: [PATCH 1/4] configure.ac: Update autotools configuration Do not use autoconf deprecated macros Use new libtool syntax honor aclocal flags --- Makefile.am | 2 +- configure.ac | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7c03294..9f672dd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST += \ # $(srcdir)/build/Makefile.win32.features-h \ # $(NULL) -ACLOCAL_AMFLAGS = -I build +ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} DIST_SUBDIRS = src doc util boilerplate test perf SUBDIRS = src doc util diff --git a/configure.ac b/configure.ac index e66ddff..7009283 100644 --- a/configure.ac +++ b/configure.ac @@ -1,18 +1,24 @@ -AC_PREREQ(2.59) +AC_PREREQ([2.63]) CAIRO_PARSE_VERSION AC_INIT([cairo], [cairo_version_major.cairo_version_minor.cairo_version_micro], - [http://bugs.freedesktop.org/enter_bug.cgi?product=cairo]) + [http://bugs.freedesktop.org/enter_bug.cgi?product=cairo], + [cairo], + [http://cairographics.org/]) AC_CONFIG_AUX_DIR(build) AC_CONFIG_MACRO_DIR(build) -AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_SRCDIR(src/cairo.h) AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL -AC_PROG_LIBTOOL dnl ([1.4]) Don't remove! + +# Initialize libtool +LT_PREREQ([2.2]) +LT_INIT([win32-dll]) + +# Api documentation GTK_DOC_CHECK([1.6]) AC_SYS_LARGEFILE -- 1.7.5.4