diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2012-10-29 09:59:30 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2012-10-29 19:00:55 -0500 |
| commit | 5680e4c3d76cd5c64175d88d0685ee6962aa1e46 (patch) | |
| tree | ab7c60c9d097528e3f3e322f15881c0134105f0a | |
| parent | 3c534f72d6d4327926474a5f8fa53cbcf19de3cf (diff) | |
Omit catalogue support on systems without symlinks
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/fontfile/catalogue.c | 4 | ||||
| -rw-r--r-- | src/fontfile/register.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b274a8f..ee3f7af 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ XORG_CHECK_SGML_DOCTOOLS(1.7) AC_CHECK_HEADERS([endian.h poll.h sys/poll.h]) # Checks for library functions. -AC_CHECK_FUNCS([poll]) +AC_CHECK_FUNCS([poll readlink]) # If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config # must first be located explicitly. diff --git a/src/fontfile/catalogue.c b/src/fontfile/catalogue.c index 8029b28..7e7e477 100644 --- a/src/fontfile/catalogue.c +++ b/src/fontfile/catalogue.c @@ -27,6 +27,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif + +#ifdef HAVE_READLINK #include <X11/fonts/fntfilst.h> #include <sys/types.h> #include <sys/stat.h> @@ -474,3 +476,5 @@ CatalogueRegisterLocalFpeFunctions (void) CatalogueListNextFontOrAlias, FontFileEmptyBitmapSource); } + +#endif /* HAVE_READLINK */ diff --git a/src/fontfile/register.c b/src/fontfile/register.c index 8d7229e..4faeb8f 100644 --- a/src/fontfile/register.c +++ b/src/fontfile/register.c @@ -57,6 +57,8 @@ FontFileRegisterFpeFunctions(void) #endif FontFileRegisterLocalFpeFunctions (); +#ifdef HAVE_READLINK CatalogueRegisterLocalFpeFunctions (); +#endif } |