Skip to content

Commit 3616a5f

Browse files
jjardonickle
authored andcommitted
configure.ac: Update autotools configuration
Do not use autoconf deprecated macros Use new libtool syntax honor aclocal flags
1 parent 93d42e8 commit 3616a5f

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ EXTRA_DIST += \
1414
# $(srcdir)/build/Makefile.win32.features-h \
1515
# $(NULL)
1616

17-
ACLOCAL_AMFLAGS = -I build
17+
ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
1818

1919
DIST_SUBDIRS = src doc util boilerplate test perf
2020
SUBDIRS = src doc util

configure.ac

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1-
AC_PREREQ(2.59)
1+
AC_PREREQ([2.63])
22
CAIRO_PARSE_VERSION
33
AC_INIT([cairo],
44
[cairo_version_major.cairo_version_minor.cairo_version_micro],
5-
[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
5+
[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo],
6+
[cairo],
7+
[http://cairographics.org/])
68
AC_CONFIG_AUX_DIR(build)
79
AC_CONFIG_MACRO_DIR(build)
8-
AC_GNU_SOURCE
910
AC_USE_SYSTEM_EXTENSIONS
1011
AC_CONFIG_SRCDIR(src/cairo.h)
1112
AC_CONFIG_HEADERS(config.h)
13+
1214
AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
1315
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
14-
AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
15-
AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
16+
17+
# Initialize libtool
18+
LT_PREREQ([2.2])
19+
LT_INIT([win32-dll])
20+
21+
# Api documentation
1622
GTK_DOC_CHECK([1.6])
1723

1824
AC_SYS_LARGEFILE

0 commit comments

Comments
 (0)