|
Line
Link Here
|
| 0 |
-- configure.ac |
0 |
++ configure.ac |
|
Lines 1-4
Link Here
|
| 1 |
dnl Initialize autoconf and automake |
1 |
nl Initialize autoconf and automake |
| 2 |
AC_INIT |
2 |
AC_INIT |
| 3 |
AC_CONFIG_SRCDIR(src/main.c) |
3 |
AC_CONFIG_SRCDIR(src/main.c) |
| 4 |
AC_PREREQ(2.52) |
4 |
AC_PREREQ(2.52) |
|
Lines 428-434
AC_TRY_LINK(
Link Here
|
| 428 |
#include <fontconfig/fontconfig.h> |
428 |
#include <fontconfig/fontconfig.h> |
| 429 |
, FcInit(), |
429 |
, FcInit(), |
| 430 |
AC_MSG_RESULT([yes]) |
430 |
AC_MSG_RESULT([yes]) |
| 431 |
AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.]), |
431 |
AC_DEFINE(HAVE_FONTCONFIG_FONTCONFIG_H,1,[Define to 1 if you have the <fontconfig/fontconfig.h> header file.]) |
|
|
432 |
|
| 433 |
AC_MSG_CHECKING([For fontconfig FcFini()]) |
| 434 |
AC_TRY_LINK( |
| 435 |
#include <fontconfig/fontconfig.h> |
| 436 |
, FcFini(), |
| 437 |
AC_MSG_RESULT([yes]) |
| 438 |
AC_DEFINE(HAVE_FONTCONFIG_FCFINI,1,[Define to 1 if FcFini() call exists]) |
| 439 |
, |
| 440 |
AC_MSG_RESULT([no])) |
| 441 |
|
| 442 |
, |
| 432 |
AC_MSG_RESULT([no]) |
443 |
AC_MSG_RESULT([no]) |
| 433 |
FONTCONFIG_LIBS= |
444 |
FONTCONFIG_LIBS= |
| 434 |
FONTCONFIG_CFLAGS= |
445 |
FONTCONFIG_CFLAGS= |
| 435 |
-- src/xwindow.c |
446 |
++ src/xwindow.c |
|
Lines 123-131
Link Here
|
| 123 |
if ((strlen((char*)file)>4) && |
123 |
if ((strlen((char*)file)>4) && |
| 124 |
(strstr((char*)file+strlen((char*)file)-4,".ttf"))) |
124 |
(strstr((char*)file+strlen((char*)file)-4,".ttf"))) |
| 125 |
imlib_add_path_to_font_path(dirname((char*)file)); |
125 |
imlib_add_path_to_font_path(dirname((char*)file)); |
| 126 |
FcFontSetDestroy(fs); |
|
|
| 127 |
FcObjectSetDestroy(os); |
| 128 |
} |
126 |
} |
|
|
127 |
#ifdef HAVE_FONTCONFIG_FCFINI |
| 128 |
FcFini(); |
| 129 |
#else |
| 130 |
/* On FontConfig >= 2.4, this causes a segfault, probably due to the new |
| 131 |
caching mechanism: we don't have to care, since FcFini() always exists, |
| 132 |
and does the dirty dessalocation job just fine. |
| 133 |
*/ |
| 134 |
if (fs) FcFontSetDestroy(fs); |
| 135 |
FcObjectSetDestroy(os); |
| 136 |
#endif |
| 129 |
} |
137 |
} |
| 130 |
#endif |
138 |
#endif |
| 131 |
imlib_add_path_to_font_path("."); |
139 |
imlib_add_path_to_font_path("."); |
