View | Details | Raw Unified
Collapse All | Expand All

(-) file_not_specified_in_diff (-4 / +23 lines)
 Lines 1-4    Link Here  
dnl Initialize autoconf and automake
 
nl Initialize autoconf and automake
 
AC_INIT
AC_INIT
AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_SRCDIR(src/main.c)
AC_PREREQ(2.52)
AC_PREREQ(2.52)
 Lines 428-434   AC_TRY_LINK( Link Here  
#include <fontconfig/fontconfig.h>
#include <fontconfig/fontconfig.h>
, FcInit(),
, FcInit(),
AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.]),
 
AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.])
 

              

            

            

              

              
AC_MSG_CHECKING([For fontconfig FcFini()])

            

            

              

              
AC_TRY_LINK(

            

            

              

              
#include <fontconfig/fontconfig.h>

            

            

              

              
, FcFini(),

            

            

              

              
AC_MSG_RESULT([yes])

            

            

              

              
AC_DEFINE(HAVE_FONTCONFIG_FCFINI,1,[Define to 1 if FcFini() call exists])

            

            

              

              
,

            

            

              

              
AC_MSG_RESULT([no]))

            

            

              

              

            

            

              

              
,

            

        
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])

        
FONTCONFIG_LIBS=
FONTCONFIG_LIBS=

        
FONTCONFIG_CFLAGS=
FONTCONFIG_CFLAGS=

  

    

    

       Lines 123-131
       
    
  Link Here 
    

  

        
	  if ((strlen((char*)file)>4) && 
	  if ((strlen((char*)file)>4) && 

        
	      (strstr((char*)file+strlen((char*)file)-4,".ttf")))
	      (strstr((char*)file+strlen((char*)file)-4,".ttf")))

        
	    imlib_add_path_to_font_path(dirname((char*)file));
	    imlib_add_path_to_font_path(dirname((char*)file));

            

              
      FcFontSetDestroy(fs);

              
            

            

              
      FcObjectSetDestroy(os);

              
            

        
    }
    }

            

              
              
#ifdef HAVE_FONTCONFIG_FCFINI

            

            

              
              
    FcFini();

            

            

              
              
#else

            

            

              
              
    /* On FontConfig >= 2.4, this causes a segfault, probably due to the new

            

            

              
              
       caching mechanism: we don't have to care, since FcFini() always exists,

            

            

              
              
       and does the dirty dessalocation job just fine.

            

            

              
              
    */

            

            

              
              
    if (fs) FcFontSetDestroy(fs);

            

            

              
              
    FcObjectSetDestroy(os);

            

            

              
              
#endif

            

        
  }
  }

        
#endif
#endif

        
  imlib_add_path_to_font_path(".");
  imlib_add_path_to_font_path(".");