[configure.ac.enable] More macro cleanup

This commit is contained in:
Behdad Esfahbod 2008-09-06 09:50:57 -04:00
parent 96e45e6779
commit eddb3f6a84
2 changed files with 119 additions and 100 deletions

View file

@ -124,6 +124,7 @@ dnl
dnl Cairo-specific macros
dnl
m4_pattern_forbid([CAIRO])
m4_pattern_forbid([^cr_])
dnl ==========================================================================

View file

@ -1,122 +1,117 @@
dnl
dnl These are the facilities for enable/disabling various backends/features,
dnl and for collecting CFLAGS/LIBS and generating per backend/feature .pc
dnl These are the facilities for enable/disabling various features,
dnl and for collecting CFLAGS/LIBS and generating per feature .pc
dnl files, assembling list of source files to compile, and creating
dnl cairo-features.h and other generated files.
dnl
dnl ===========================================================================
dnl
dnl cairo_cache_version should be increased every time that the backend
dnl cairo_cache_version should be increased every time that the feature
dnl detection stuff changes in a way that removing the config.cache file may be
dnl needed for correct operation. (this is only for the backend detection
dnl needed for correct operation. (this is only for the feature detection
dnl changes; it doesn't have any effect on any other cached thing.)
dnl
m4_define(cairo_cache_version, 4)
m4_define(cairo_cache_version, 5)
dnl ===========================================================================
dnl
dnl Define a macro to enable features
dnl - Macro: _CAIRO_ENABLE_FULL (NAMESPACE, NAME, ARG, FEATURE_NAME, DEFAULT, WHAT, COMMANDS)
dnl - Macro: _CAIRO_ENABLE_FULL (ID, NAME, ARG, TAG, DEFAULT, WHAT, COMMANDS)
dnl
dnl where:
dnl
dnl NAMESPACE is the sub-namespace in function names, eg. "ft" for cairo_ft_...
dnl NAME is the human-readable name of the backend, eg. "FreeType font"
dnl ARG is what enables the backend, eg. "freetype" for --enable-freetype
dnl FEATURE_NAME is the feature conditional, eg. CAIRO_HAS_FT_FONT
dnl ID is the sub-namespace in function names, eg. "ft" for cairo_ft_...
dnl NAME is the human-readable name of the feature, eg. "FreeType font"
dnl ARG is what enables the feature, eg. "ft" for --enable-ft
dnl TAG is the feature conditional, eg. CAIRO_HAS_FT_FONT
dnl WHAT is the type of feature:
dnl "surface" for surface backends
dnl "font" for font backends
dnl "functions" for set of functions
dnl "" for private configurations
dnl DEFAULT is the default state of the backend:
dnl DEFAULT is the default state of the feature:
dnl "no" for experimental backends, eg. your favorite new backend
dnl "yes" for mandatory backends, eg. png
dnl "auto" for other supported backends, eg. xlib
dnl COMMANDS are run to check whether the backend can be enabled. Their
dnl COMMANDS are run to check whether the feature can be enabled. Their
dnl result may be cached, so user should not count on them being run.
dnl They should set use_$(NAMESPACE) to something other than yes if the
dnl backend cannot be built, eg. "no (requires SomeThing)". It then
dnl should also set $(NAMESPACE)_REQUIRES/CFLAGS/LIBS/...
dnl They should set use_$(ID) to something other than yes if the
dnl feature cannot be built, eg. "no (requires SomeThing)". It then
dnl should also set $(ID)_REQUIRES/CFLAGS/LIBS/...
dnl appropriately. Look at the macro definition for more details,
dnl or ask if in doubt.
dnl
AC_DEFUN([_CAIRO_ENABLE_FULL],
[ AC_ARG_ENABLE([$3],
AS_HELP_STRING([--enable-$3=@<:@no/auto/yes@:>@],
[Enable cairo's $2 backend @<:@default=$6@:>@]),
enable_$1=$enableval, enable_$1=$6)
[
m4_define([cr_feature], [$1])
m4_define([cr_feature_name], m4_expand([$2]))
m4_define([cr_feature_arg], m4_expand([$3]))
m4_define([cr_feature_tag], m4_expand([$4]))
m4_define([cr_feature_what], m4_expand([$5]))
m4_define([cr_feature_default], m4_expand([$6]))
m4_define([cr_feature_commands], [$7])
AC_ARG_ENABLE(cr_feature_arg,
AS_HELP_STRING([--enable-]cr_feature_arg[=@<:@no/auto/yes@:>@],
[Enable cairo's ]cr_feature_name[ feature @<:@default=]cr_feature_default[@:>@]),
enable_$1=$enableval, enable_$1=cr_feature_default)
case $enable_$1 in
no)
use_$1="no (disabled, use --enable-$3 to enable)"
use_$1="no (disabled, use --enable-cr_feature_arg to enable)"
;;
yes|auto)
if test "x$cairo_cv_backend_[]$1[]_cache_version" != "x[]cairo_cache_version"; then
# cached results for this backend (if any) are stale. force rechecking.
unset cairo_cv_backend_[]$1[]_use
if test "x$cairo_cv_[]$1[]_cache_version" != "x[]cairo_cache_version"; then
# cached results for this feature (if any) are stale. force rechecking.
unset cairo_cv_[]$1[]_use
fi
AC_CACHE_CHECK([for cairo's $2 backend], cairo_cv_backend_[]$1[]_use,
AC_CACHE_CHECK([for cairo's ]cr_feature_name[ feature], cairo_cv_[]$1[]_use,
[
echo
use_[]$1=yes
$1[]_REQUIRES=$ac_env_[]$1[]_REQUIRES_value
$1[]_CFLAGS=$ac_env_[]$1[]_CFLAGS_value
$1[]_LIBS=$ac_env_[]$1[]_LIBS_value
$1[]_NONPKGCONFIG_CFLAGS=$ac_env_[]$1[]_NONPKGCONFIG_CFLAGS_value
$1[]_NONPKGCONFIG_LIBS=$ac_env_[]$1[]_NONPKGCONFIG_LIBS_value
$1[]_BASE=cairo
$7
cairo_cv_backend_[]$1[]_use=$use_[]$1
cairo_cv_backend_[]$1[]_cache_version=cairo_cache_version
cairo_cv_backend_[]$1[]_requires=$[]$1[]_REQUIRES
cairo_cv_backend_[]$1[]_cflags=$[]$1[]_CFLAGS
cairo_cv_backend_[]$1[]_libs=$[]$1[]_LIBS
cairo_cv_backend_[]$1[]_nonpkgconfig_cflags=$[]$1[]_NONPKGCONFIG_CFLAGS
cairo_cv_backend_[]$1[]_nonpkgconfig_libs=$[]$1[]_NONPKGCONFIG_LIBS
cairo_cv_backend_[]$1[]_base=$[]$1[]_BASE
AC_MSG_CHECKING([whether cairo's $2 backend could be enabled])
CAIRO_FEATURE_VARS_FOREACH(cr_var, [cr_feature[_]cr_var[=$ac_env_]cr_feature[_]cr_var[_value]
])
cr_feature_commands
cairo_cv_[]$1[]_use=$use_[]$1
cairo_cv_[]$1[]_cache_version=cairo_cache_version
CAIRO_FEATURE_VARS_FOREACH([cr_var], [[cairo_cv_]cr_feature[_]cr_var[=$]cr_feature[_]cr_var
])
AC_MSG_CHECKING([whether cairo's ]cr_feature_name[ feature could be enabled])
])
use_[]$1=$cairo_cv_backend_[]$1[]_use
$1[]_BASE=$cairo_cv_backend_[]$1[]_base
$1[]_REQUIRES="$cairo_cv_backend_[]$1[]_requires "
$1[]_CFLAGS="$cairo_cv_backend_[]$1[]_cflags "
$1[]_LIBS="$cairo_cv_backend_[]$1[]_libs "
$1[]_NONPKGCONFIG_CFLAGS="$cairo_cv_backend_[]$1[]_nonpkgconfig_cflags "
$1[]_NONPKGCONFIG_LIBS="$cairo_cv_backend_[]$1[]_nonpkgconfig_libs "
# null the ones that only have space
test "x$$1[]_REQUIRES" = "x " && $1[]_REQUIRES=""
test "x$$1[]_CFLAGS" = "x " && $1[]_CFLAGS=""
test "x$$1[]_LIBS" = "x " && $1[]_LIBS=""
test "x$$1[]_NONPKGCONFIG_CFLAGS" = "x " && $1[]_NONPKGCONFIG_CFLAGS=""
test "x$$1[]_NONPKGCONFIG_LIBS" = "x " && $1[]_NONPKGCONFIG_LIBS=""
use_[]$1=$cairo_cv_[]$1[]_use
AS_IF([test "x$enable_$1" = "xyes" -a "x$use_$1" != xyes],
[
AC_MSG_ERROR([requested $2 backend could not be enabled])
AC_MSG_ERROR([requested ]cr_feature_name[ feature could not be enabled])
])
;;
*)
AC_MSG_ERROR([invalid argument passed to --enable-$3: $use_$1, should be one of @<:@no/auto/yes@:>@])
AC_MSG_ERROR([invalid argument passed to --enable-]cr_feature_arg[: `$use_$1', should be one of @<:@no/auto/yes@:>@])
;;
esac
AS_IF([test "x$use_$1" = "xyes"],
[
CAIRO_FEATURE_VARS_FOREACH([cr_var], [cr_feature[_]cr_var[=$cairo_cv_]cr_feature[_]cr_var
])
],[
dnl If not enabled, empty the vars so no one accidentally uses them.
CAIRO_FEATURE_VARS_FOREACH([cr_var], [cr_feature[_]cr_var[=$cairo_cv_]cr_feature[_]cr_var
])
])
if test "x$use_$1" = xyes; then
CAIRO_FEATURES="$4 $CAIRO_FEATURES"
CAIRO_REQUIRES="$$1_REQUIRES$CAIRO_REQUIRES"
CAIRO_CFLAGS="$$1_NONPKGCONFIG_CFLAGS$$1_CFLAGS$CAIRO_CFLAGS"
CAIRO_LIBS="$$1_NONPKGCONFIG_LIBS$$1_LIBS$CAIRO_LIBS"
CAIRO_NONPKGCONFIG_CFLAGS="$$1_NONPKGCONFIG_CFLAGS$CAIRO_NONPKGCONFIG_CFLAGS"
CAIRO_NONPKGCONFIG_LIBS="$$1_NONPKGCONFIG_LIBS$CAIRO_NONPKGCONFIG_LIBS"
CAIRO_FEATURE_VARS_FOREACH([cr_var], [[test -n "$]cr_feature[_]cr_var[" && CAIRO_]cr_var[="$]cr_feature[_]cr_var[ $CAIRO_]cr_var["]
])
CAIRO_FEATURES="cr_feature_tag $CAIRO_FEATURES"
m4_define([cairo_backend_pc], m4_bpatsubst(src/cairo-$1.pc,_,-))
AC_CONFIG_FILES(cairo_backend_pc():src/cairo-backend.pc.in,
[
$SED -i -e "
s,@backend_name@,$1,g;
s,@Backend_Name@,$2,g;
s,@Backend_Name@,cr_feature_name,g;
s,@BACKEND_BASE@,$$1_BASE,g;
s,@BACKEND_REQUIRES@,$$1_REQUIRES,g;
s%@BACKEND_NONPKGCONFIG_LIBS@%$$1_NONPKGCONFIG_LIBS%g;
@ -132,23 +127,23 @@ AC_DEFUN([_CAIRO_ENABLE_FULL],
])
fi
AM_CONDITIONAL($4, test "x$use_$1" = xyes)
AM_CONDITIONAL(cr_feature_tag, test "x$use_$1" = xyes)
dnl Collect list of all supported but disabled features
AS_IF([test "x$use_$1" != xyes -a "x$6" != xno],
AS_IF([test "x$use_$1" != xyes -a "x]cr_feature_default[" != xno],
[
CAIRO_NO_FEATURES="$4 $CAIRO_NO_FEATURES"
CAIRO_NO_FEATURES="cr_feature_tag $CAIRO_NO_FEATURES"
])
dnl Collect list of all (un)supported features and cairo headers
AS_IF([test "x$6" = xno],
AS_IF([test "x]cr_feature_default[" = xno],
[
CAIRO_CONFIG_AMAKE=$CAIRO_CONFIG_AMAKE'
unsupported_cairo_headers += $(cairo_$1_headers)'
CAIRO_CONFIG_WIN32=$CAIRO_CONFIG_WIN32'
unsupported_cairo_headers += $(cairo_$1_headers)'
],[
CAIRO_SUPPORTED_FEATURES="$4 $CAIRO_SUPPORTED_FEATURES"
CAIRO_SUPPORTED_FEATURES="cr_feature_tag $CAIRO_SUPPORTED_FEATURES"
CAIRO_CONFIG_AMAKE=$CAIRO_CONFIG_AMAKE'
supported_cairo_headers += $(cairo_$1_headers)'
CAIRO_CONFIG_WIN32=$CAIRO_CONFIG_WIN32'
@ -161,7 +156,7 @@ all_cairo_pkgconf += $(cairo_$1_pkgconf)
all_cairo_headers += $(cairo_$1_headers)
all_cairo_private += $(cairo_$1_private)
all_cairo_sources += $(cairo_$1_sources)
if $4
if cr_feature_tag
enabled_cairo_pkgconf += $(cairo_$1_pkgconf)
enabled_cairo_headers += $(cairo_$1_headers)
enabled_cairo_private += $(cairo_$1_private)
@ -173,7 +168,7 @@ all_cairo_pkgconf += $(cairo_$1_pkgconf)
all_cairo_headers += $(cairo_$1_headers)
all_cairo_private += $(cairo_$1_private)
all_cairo_sources += $(cairo_$1_sources)
ifeq ($($4),1)
ifeq ($(cr_feature_tag),1)
enabled_cairo_pkgconf += $(cairo_$1_pkgconf)
enabled_cairo_headers += $(cairo_$1_headers)
enabled_cairo_private += $(cairo_$1_private)
@ -181,32 +176,28 @@ enabled_cairo_sources += $(cairo_$1_sources)
endif
'
dnl Collect warning message for enabled unsupported backends
AS_IF([test "x$use_$1" = xyes -a "x$6" = xno],
AS_IF([test "x$use_$1" = xyes -a "x]cr_feature_default[" = xno],
[
CAIRO_WARNING_MESSAGE="$CAIRO_WARNING_MESSAGE
*** The $2 backend is still under active development and
*** is included in this release only as a preview. It does NOT
*** fully work yet and incompatible changes may yet be made
*** to $2-backend specific API.
m4_text_wrap([The ]cr_feature_name[ feature is still under active development and is included in this release only as a preview. It does NOT fully work yet and incompatible changes may yet be made to ]cr_feature_name[ specific API.], [--- ],, 72)
"
])
dnl Collect warning message for disabled recommended backends
AS_IF([test "x$use_$1" != xyes -a "x$6" = xyes],
AS_IF([test "x$use_$1" != xyes -a "x]cr_feature_default[" = xyes],
[
CAIRO_WARNING_MESSAGE="$CAIRO_WARNING_MESSAGE
*** It is strictly recommended that you do NOT disable
*** the $2 backend.
m4_text_wrap([It is strictly recommended that you do NOT disable the ]cr_feature_name[ backend.], [+++ ],, 72)
"
])
])
m4_pattern_allow(^CAIRO_HAS_)
m4_define([_CAIRO_BUILD_FEATURE_NAME_NORMALIZED],
m4_define([_CAIRO_BUILD_FEATURE_TAG_NORMALIZED],
[CAIRO_HAS_[$1]m4_bmatch([$1],[$2$],,[$2])])
m4_define([_CAIRO_BUILD_FEATURE_NAME],
[_CAIRO_BUILD_FEATURE_NAME_NORMALIZED(AS_TR_CPP([$1]),AS_TR_CPP(m4_ifval([$2],[ $2])))])
m4_define([_CAIRO_BUILD_FEATURE_TAG],
[_CAIRO_BUILD_FEATURE_TAG_NORMALIZED(AS_TR_CPP([$1]),AS_TR_CPP(m4_ifval([$2],[ $2])))])
dnl Like _CAIRO_ENABLE*, but takes an object type too
AC_DEFUN([_CAIRO_ENABLE],
@ -221,31 +212,30 @@ AC_DEFUN([_CAIRO_ENABLE],
[$1],
m4_normalize([$2]),
m4_translit([$1],[_],[-]),
_CAIRO_BUILD_FEATURE_NAME([$1],m4_normalize([$3])),
_CAIRO_BUILD_FEATURE_TAG([$1],m4_normalize([$3])),
m4_normalize([$3]),
m4_normalize([$4]),
[$5]
)dnl
])
dnl ===========================================================================
dnl
dnl Define macros to enable various features.
dnl - Macro: CAIRO_ENABLE_* (NAMESPACE, NAME, DEFAULT, COMMANDS)
dnl - Macro: CAIRO_ENABLE_* (ID, NAME, DEFAULT, COMMANDS)
dnl
dnl where:
dnl
dnl FEATURENAME is the feature name, eg. "ft" for cairo_ft_...
dnl ID is the feature id, eg. "ft" for cairo_ft_...
dnl NAME is the human-readable name of the feature, eg. "FreeType"
dnl DEFAULT is the default state of the backend:
dnl DEFAULT is the default state of the feature:
dnl "no" for experimental backends, eg. your favorite new backend
dnl "yes" for mandatory backends, eg. png
dnl "auto" for other supported backends, eg. xlib
dnl COMMANDS are run to check whether the feature can be enabled. Their
dnl result may be cached, so user should not count on them being run.
dnl They should set use_$(NAMESPACE) to something other than yes if the
dnl backend cannot be built, eg. "no (requires SomeThing)". It then
dnl should also set $(NAMESPACE)_REQUIRES/CFLAGS/LIBS/...
dnl They should set use_$(ID) to something other than yes if the
dnl feature cannot be built, eg. "no (requires SomeThing)". It then
dnl should also set $(ID)_REQUIRES/CFLAGS/LIBS/...
dnl appropriately. Look at the macro definition for more details,
dnl or ask if in doubt.
dnl
@ -263,14 +253,43 @@ AC_DEFUN([CAIRO_ENABLE_FUNCTIONS],
[_CAIRO_ENABLE([$1], [$2 functions], functions, [$3],[$4])])
dnl ===========================================================================
dnl
dnl CAIRO_FEATURE_VARS_REGISTER(VARS, INITIAL-VALUE=[])
dnl
dnl Registers variables to be collected from feature-enabling code segments.
dnl VARS should be a whitespace-separate list of variable names.
dnl
dnl XXX Should be able to set default value
dnl
dnl XXX Set separator. Also, prepend/append setting
dnl
dnl XXX An aggregate of the values from all enabled features is collected in
dnl variables named as VARS but prefixed with CAIRO_.
dnl
AC_DEFUN([CAIRO_FEATURE_VARS_REGISTER],
[
m4_foreach_w([cr_var], [$1],
[m4_append_uniq([CAIRO_FEATURE_VARS], cr_var, [ ],,
[m4_fatal([Feature variable `]cr_var[' already registered])])])
m4_foreach_w([cr_var], [$1], [[CAIRO_]cr_var[="$2"]
])
m4_foreach_w([cr_var], [$1], [m4_pattern_allow([CAIRO_]cr_var)])
])
AC_DEFUN([CAIRO_FEATURE_VARS_FOREACH],
[
m4_foreach_w([$1], m4_expand(CAIRO_FEATURE_VARS), [$2])
])
dnl ===========================================================================
dnl
dnl Report
dnl
dnl Accumulator for warning messages
m4_pattern_allow(^CAIRO_WARNING_MESSAGE$)
CAIRO_WARNING_MESSAGE=""
CAIRO_FEATURE_VARS_REGISTER([WARNING_MESSAGE])
AC_DEFUN([CAIRO_REPORT],
[
@ -341,18 +360,17 @@ dnl pkg-config requires, non-pkgconfig cflags and libs, and total cflags and lib
dnl
dnl Accumulators
CAIRO_REQUIRES=""
CAIRO_NONPKGCONFIG_CFLAGS=""
CAIRO_NONPKGCONFIG_LIBS="$LIBS"
CAIRO_CFLAGS=$CAIRO_NONPKGCONFIG_CFLAGS
CAIRO_LIBS=$CAIRO_NONPKGCONFIG_LIBS
CAIRO_FEATURE_VARS_REGISTER([REQUIRES BASE])
CAIRO_FEATURE_VARS_REGISTER([CFLAGS NONPKGCONFIG_CFLAGS])
CAIRO_FEATURE_VARS_REGISTER([LIBS NONPKGCONFIG_LIBS], [$LIBS])
dnl Substitute
dnl Substitute vars
AC_SUBST(CAIRO_REQUIRES)
AC_SUBST(CAIRO_NONPKGCONFIG_CFLAGS)
AC_SUBST(CAIRO_NONPKGCONFIG_LIBS)
AC_SUBST(CAIRO_BASE)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_NONPKGCONFIG_CFLAGS)
AC_SUBST(CAIRO_LIBS)
AC_SUBST(CAIRO_NONPKGCONFIG_LIBS)
dnl ===========================================================================