diff -up pango-1.25.1/pango/opentype/Makefile.in.cxx pango-1.25.1/pango/opentype/Makefile.in
--- pango-1.25.1/pango/opentype/Makefile.in.cxx	2009-08-10 13:58:16.000000000 -0400
+++ pango-1.25.1/pango/opentype/Makefile.in	2009-08-10 13:57:47.000000000 -0400
@@ -105,7 +105,7 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CXX = $(CC) -fno-rtti -fno-exceptions -Wabi -Wpadded -Wcast-align
+CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -264,6 +264,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
+
+# The following warning options are useful for debugging: -Wpadded -Wcast-align
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
 noinst_LTLIBRARIES = libharfbuzz.la
 HBSOURCES = \
 	hb-blob.c \