Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
configure.ac: Update autotools configuration
Do not use autoconf deprecated macros
Use new libtool syntax
honor aclocal flags
  • Loading branch information
Javier Jardón authored and Chris Wilson committed Apr 14, 2012
1 parent 93d42e8 commit 3616a5f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -14,7 +14,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
Expand Down
16 changes: 11 additions & 5 deletions 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
Expand Down

0 comments on commit 3616a5f

Please sign in to comment.