--- configure.orig	Sun Jun 23 12:18:35 2002
+++ configure	Sun Jun 23 12:23:23 2002
@@ -14689,6 +14689,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -25601,7 +25602,7 @@
           freetype_prefix=`freetype-config --prefix`
           freetype_exec_prefix=`freetype-config --exec-prefix`
           LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
-          CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
+          CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
        fi
     fi