brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fallout from SVN merge

Browse Source
This commit is contained in:
Emmanuele Bassi 2007-07-26 10:00:13 +00:00
parent e77a6f0af3
commit 1a99f705da
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

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