fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 06:28:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[configure.in] Slight massage for recent Ubuntu autotools.

Browse source 
Fix up a couple of minor complaints about possibly undefined macros,
cached conditional values and suggested improvements.
This commit is contained in:
Chris Wilson 2008-08-06 09:19:02 +01:00
parent 7c1078b830
commit afdf3917ee
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -5,6 +5,8 @@ if CAIRO_HAS_PNG_FUNCTIONS
SUBDIRS += boilerplate test perf
endif
ACLOCAL_AMFLAGS=-I m4
.PHONY: doc test retest recheck check-valgrind
# We have some generated header files, so we really need to build the

16
configure.in
View file

@ -14,6 +14,7 @@ AC_INIT([cairo],
[http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
AC_CONFIG_SRCDIR(src/cairo.h)
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
dnl automake 1.8 requires autoconf 2.58
dnl automake 1.7 requires autoconf 2.54
@ -26,23 +27,23 @@ dnl ===========================================================================
# libtool shared library version
# Increment if the interface has additions, changes, removals.
LT_CURRENT=20
m4_define(LT_CURRENT, 20)
# Increment any time the source changes; set to
# 0 if you increment CURRENT
LT_REVISION=0
m4_define(LT_REVISION, 0)
# Increment if any interfaces have been added; set to 0
# if any interfaces have been removed. removal has
# precedence over adding, so set to 0 if both happened.
LT_AGE=18
m4_define(LT_AGE, 18)
dnl ===========================================================================
VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
VERSION_INFO=LT_CURRENT():LT_REVISION():LT_AGE()
AC_SUBST(VERSION_INFO)
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
LT_CURRENT_MINUS_AGE=m4_eval(LT_CURRENT() - LT_AGE())
AC_SUBST(LT_CURRENT_MINUS_AGE)
CAIRO_VERSION_MAJOR=cairo_version_major()
@ -61,6 +62,7 @@ dnl ===========================================================================
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX dnl required for BeOS (and cannot be a conditional dependency)
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL dnl required version (1.4) DON'T REMOVE!
AC_STDC_HEADERS
@ -459,10 +461,6 @@ CAIRO_BACKEND_ENABLE(beos, BeOS/Zeta, beos, BEOS_SURFACE, no, [
esac
])
if test "x$use_beos" = "xyes"; then
AC_PROG_CXX
fi
dnl ===========================================================================
CAIRO_BACKEND_ENABLE(png, PNG, png, PNG_FUNCTIONS, yes, [