Fix fallout from SVN merge

This commit is contained in:
Emmanuele Bassi 2007-07-26 10:00:13 +00:00
parent e77a6f0af3
commit 1a99f705da

View File

@ -402,11 +402,8 @@ echo ""
echo " Flavour: ${clutterbackend}/${CLUTTER_COGL}"
echo " Target library: ${clutterbackendlib}"
echo " Debug level: ${enable_debug}"
<<<<<<< HEAD:configure.ac
echo " Fast FP conversions: ${enable_fast_fp_conversions}"
=======
echo " Compiler flags: ${CPPFLAGS}"
>>>>>>> Enable strict compiler flags with a configure flag:configure.ac
echo " API Documentation: ${enable_gtk_doc}"
echo " Manual Documentation: ${enable_manual}"
echo " FPU Support: ${with_fpu}"