[tlbuild] rebuild time

[Jukka Salmi]

Karl Berry --> tlbuild (2009-09-04 16:25:42 -0500):
> Jonathan checked in the XeTeX changes, which will affect xetex and
> xdvipdfmx.

Speaking of xdvipdfmx, I just noticed that I'm still using a local hack
in texk/xdvipdfmx/configure (diff attached) to make a build using system
freetype libraries succeed on NetBSD 5.  Without the patch building
fails because FreeType 1 headers get included before FreeType 2 headers.

I'm not sure how to fix this correctly.  What about the attached patch
to m4/kpse-common.m4 which inserts the added flags before instead of
after the existing flags to CFLAGS?  It seems to fix the build for
xdvipdfmx here, but the m4 file in question is used in many different
places, and I reran autoconf just for xdvipdfmx...


Regards, Jukka

-- 
This email fills a much-needed gap in the archives.
-------------- next part --------------
Index: texk/xdvipdfmx/configure
===================================================================
--- texk/xdvipdfmx/configure	(revision 15122)
+++ texk/xdvipdfmx/configure	(working copy)
@@ -18300,7 +18300,7 @@
 
 
 
-CPPFLAGS="$CPPFLAGS $FREETYPE2_INCLUDES"
+CPPFLAGS="$FREETYPE2_INCLUDES $CPPFLAGS"
 LIBS="$FREETYPE2_LIBS $LIBS"
 
 { $as_echo "$as_me:$LINENO: checking for freetype2 header files and library" >&5
-------------- next part --------------
Index: m4/kpse-common.m4
===================================================================
--- m4/kpse-common.m4	(revision 15121)
+++ m4/kpse-common.m4	(working copy)
@@ -194,7 +194,7 @@
 # Add flags for LIBDIR to values of CPPFLAGS and LIBS.
 AC_DEFUN([KPSE_ADD_FLAGS],
 [AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
-CPPFLAGS="$CPPFLAGS $[]AS_TR_CPP($1)_INCLUDES"
+CPPFLAGS="$[]AS_TR_CPP($1)_INCLUDES $CPPFLAGS"
 LIBS="$[]AS_TR_CPP($1)_LIBS $LIBS"
 ]) # KPSE_ADD_FLAGS