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

[build] Don't define feature variables in Makefile.win32.features

Browse source 
This is not the right place to do that as one also needs to adjust
cairo-features.h.  Working on a proper fix.
This commit is contained in:
Behdad Esfahbod 2008-09-22 19:29:17 -04:00
parent eb9ce58059
commit 984320dff1
2 changed files with 0 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
build/aclocal.makefile.m4
View file

@ -3,22 +3,6 @@ dnl These are the facilities for generating Makefile.am.features and
dnl Makefile.win32.features files.
dnl
dnl
dnl CAIRO_FEATURE_HOOK_REGISTER_WIN32(WHAT, COMMANDS)
dnl
dnl Like CAIRO_FEATURE_HOOK_REGISTER but only applies to features that
dnl are by default enabled on win32 build system and match WHAT.
dnl
AC_DEFUN([CAIRO_FEATURE_HOOK_REGISTER_WIN32],
[dnl
dnl builtin features
CAIRO_FEATURE_HOOK_REGISTER([*], always, [$1], [$2])dnl
dnl recommended features
CAIRO_FEATURE_HOOK_REGISTER([*], yes, [$1], [$2])dnl
dnl native win32 features
CAIRO_FEATURE_HOOK_REGISTER([*], auto, [$1], [m4_bmatch(cr_feature, [win32], [$2])])dnl
])dnl
dnl ===========================================================================
dnl
@ -52,17 +36,6 @@ AC_DEFUN([CAIRO_INIT_MAKEFILES],
dnl An empty line per feature for readability
CAIRO_MAKEFILE_ACCUMULATE_FEATURE(*,*,*,*,[])dnl
dnl Turn win32 features on
CAIRO_FEATURE_HOOK_REGISTER_WIN32(*, [_CAIRO_MAKEFILES_WIN32_DEFINE_FEATURE])dnl
])dnl
m4_define([_CAIRO_MAKEFILES_WIN32_DEFINE_FEATURE],
[
m4_foreach_w([cr_makefile], _CAIRO_MAKEFILES,
[dnl
CAIRO_ACCUMULATE([MAKEFILE_]cr_makefile[_WIN32], [ifeq ($(]cr_feature_tag[),)]m4_newline[]cr_feature_tag[ = 1]m4_newline[endif])dnl
])dnl
])dnl
dnl ===========================================================================

22
build/configure.ac.features
View file

@ -234,12 +234,6 @@ CAIRO_FEATURE_HOOK_REGISTER(no,!no,!,
[dnl
CAIRO_ACCUMULATE(NO_FEATURES, cr_feature_tag)
])dnl
dnl Collect list of public features to enable on win32 build system
CAIRO_ACCUMULATORS_REGISTER(WIN32_FEATURES,[ ])dnl
CAIRO_FEATURE_HOOK_REGISTER_WIN32(!,
[dnl
CAIRO_ACCUMULATE(WIN32_FEATURES, cr_feature_tag)
])dnl
dnl Generate src/cairo-features.h
CAIRO_CONFIG_COMMANDS([src/cairo-features.h],
@ -285,22 +279,6 @@ CAIRO_FEATURE_HOOK_REGISTER(yes,*,,
AC_DEFINE(cr_feature_tag, 1, [Define to 1 to enable cairo's ]cr_feature_name[ feature])
])dnl
dnl Generate src/cairo-features-win32.h
CAIRO_CONFIG_COMMANDS([$srcdir/src/cairo-features-win32.h],
[dnl
echo '/* Generated by configure. Do not edit. */'
echo '#ifndef CAIRO_FEATURES_H'
echo '#define CAIRO_FEATURES_H'
echo ''
for FEATURE in $CAIRO_WIN32_FEATURES; do
echo "#define $FEATURE 1"
done
echo ''
echo '#endif'
],[dnl
CAIRO_WIN32_FEATURES='$CAIRO_WIN32_FEATURES'
])dnl
dnl ===========================================================================
dnl
dnl Report