--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ 	2005-03-28 16:18:02.000000000 +0000
@@ -0,0 +1,13 @@ 
+--- configure.in-	2005-03-28 16:16:37.000000000 +0000
@@ -2,6 +2,7 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.6-r2.ebuild,v 1.9 2005/02/19 08:03:26 corsair Exp $
 
+inherit flag-o-matic
 IUSE="cups debug truetype opengl"
 DESCRIPTION="C++ based Toolkit for developing Graphical User Interfaces easily and effectively"
 SRC_URI="http://www.fox-toolkit.org/ftp/${P}.tar.gz"
@@ -12,10 +13,21 @@ 
 
 DEPEND="virtual/libc
 	virtual/x11
+	>=sys-devel/autoconf-2.58
 	truetype? ( >=media-libs/freetype-2.1.5-r1 )
 	opengl? ( virtual/opengl )"
 
 
+src_unpack() {
+	ebegin "Unpack ${PV} source"
+	unpack ${P}.tar.gz > /dev/null
+	eend 0
+	einfo "Use the builder's CXXFLAGS, not fox's idea of what they should be."
+	cd ${S}
+	epatch ${FILESDIR}/${P}-CXXFLAGS.patch
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+	libtoolize --copy --force
+}
 src_compile() {
 	local myconf
 
@@ -23,9 +35,12 @@ 
 	myconf="$myconf `use_enable cups`"              #default disabled
 	myconf="$myconf `use_enable debug`"             #default disabled
 	use truetype && myconf="$myconf --with-xft"     #default disabled
+	use debug || append-flags "-DNDEBUG"
 
+	# Force configure to use our own CXXFLAGS
 	# Following line closes #61694
 	CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" \
+	CXXFLAGS=${CXXFLAGS} \
 	./configure \
 		--prefix=/usr \
 		--mandir='${prefix}'/share/man \