diff -rubBN fontconfig-2.5.0.orig/Makefile.am fontconfig-2.5.0/Makefile.am --- fontconfig-2.5.0.orig/Makefile.am Wed Nov 14 01:36:31 2007 +++ fontconfig-2.5.0/Makefile.am Mon Jan 7 11:28:55 2008 @@ -95,8 +95,8 @@ $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \ fi; fi @(if $(RUN_FC_CACHE_TEST); then \ - echo " fc-cache/fc-cache -s -f -v"; \ - fc-cache/fc-cache -s -f -v; \ + echo " fc-cache/fc-cache$(EXEEXT) -s -f -v"; \ + fc-cache/fc-cache$(EXEEXT) -s -f -v; \ else \ echo "***"; \ echo "*** Warning: fonts.cache not built"; \ diff -rubBN fontconfig-2.5.0.orig/configure.in fontconfig-2.5.0/configure.in --- fontconfig-2.5.0.orig/configure.in Wed Nov 14 03:54:45 2007 +++ fontconfig-2.5.0/configure.in Mon Jan 7 11:52:11 2008 @@ -66,12 +66,16 @@ dnl ========================================================================== +os_win32=no +os_interix=no + case "$host" in *-*-mingw*) os_win32=yes ;; - *) - os_win32=no + *-*-interix*|*-*-winnt*) + os_interix=yes + ;; esac AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") @@ -380,7 +384,7 @@ case "$default_fonts" in yes) - if test "$os_win32" = "yes"; then + if test "$os_win32" = "yes" || test "$os_interix" = "yes"; then FC_DEFAULT_FONTS="WINDOWSFONTDIR" AC_DEFINE_UNQUOTED(FC_DEFAULT_FONTS, "WINDOWSFONTDIR", [Windows font directory]) @@ -459,7 +463,7 @@ case $fc_cachedir in no|yes) - if test "$os_win32" = "yes"; then + if test "$os_win32" = "yes" || test "$os_interix" = "yes"; then fc_cachedir="WINDOWSTEMPDIR_FONTCONFIG_CACHE" else fc_cachedir=`eval echo "${localstatedir}/cache/"${PACKAGE}` diff -rubBN fontconfig-2.5.0.orig/src/fcint.h fontconfig-2.5.0/src/fcint.h --- fontconfig-2.5.0.orig/src/fcint.h Wed Nov 14 00:23:39 2007 +++ fontconfig-2.5.0/src/fcint.h Mon Jan 7 11:41:45 2008 @@ -35,6 +35,9 @@ #include #elif defined(HAVE_STDINT_H) #include +#elif defined(_WIN32) +typedef short int16_t; +typedef int int32_t; #else #error missing C99 integer data types #endif