diff options
| author | pfaedit <pfaedit> | 2007-08-17 19:09:02 +0000 |
|---|---|---|
| committer | pfaedit <pfaedit> | 2007-08-17 19:09:02 +0000 |
| commit | 46eb5052fa042bed28b5174b4e44bc77fbde5dcd (patch) | |
| tree | 87136170c2addb8a53180d4f62e9a749223b0b2a /configure.dynamic.in | |
| parent | a1b9510365ac988b1fd5767edf7851da22d58842 (diff) | |
Patch from Kelly Anderson of SlackWare to make fontforge's build support DESTDIR and VPATH.
Diffstat (limited to 'configure.dynamic.in')
| -rw-r--r-- | configure.dynamic.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/configure.dynamic.in b/configure.dynamic.in index 3c9d152b..f5dd2e67 100644 --- a/configure.dynamic.in +++ b/configure.dynamic.in @@ -155,7 +155,7 @@ if test "$python" = "yes" ; then LIBS="$LIBS $PyLibs" CPPFLAGS="$CPPFLAGS $PyIncs" else - # sometimes python gets it wrong. The following doesn't work on mac + # python gets it wrong on all my build systems, this seems to work instead PyName="python$PyVersion" AC_SEARCH_LIBS(Py_Main, $PyName python, : , python="no") if test -d /usr/include/$PyName ; then @@ -298,9 +298,8 @@ if test "$ac_cv_lib_freetype_FT_New_Memory_Face" = "yes" ; then AC_CHECK_LIB(freetype, TT_RunIns, gww_hasbytecode="yes", : ) ]) fi -if test "$gww_hasbytecode" = "yes" ; then - AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", gww_hasbytecode="no") -fi +AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", gww_hasbytecode="no") +AC_CHECK_HEADERS([pthread.h], : , gww_hasbytecode="no") if test \( "$gww_hasbytecode" = "yes" \) -a \( "$FreeType2_IncRoot" != "" \); then gww_hasbytecode="no" @@ -501,16 +500,16 @@ case "$host" in esac fi -AC_ARG_WITH(multilayer, - [ --with-multilayer Control whether we build with support for type3/svg fonts containing multilayered drawing with strokes, fills, images, etc.], +AC_ARG_ENABLE(multilayer, + [ --enable-multilayer Control whether we build with support for type3/svg fonts containing multilayered drawing with strokes, fills, images, etc.], [ if test "$withval" != "no" >/dev/null 2>&1 ; then AC_DEFINE(FONTFORGE_CONFIG_TYPE3) fi ], : ) -AC_ARG_WITH(devicetables, - [ --with-devicetables Control whether we build with support for device tables which allow fine control of kerning (etc.) at small point sizes], +AC_ARG_ENABLE(devicetables, + AS_HELP_STRING([--enable-devicetables], [Control whether we build with support for device tables which allow fine control of kerning (etc.) at small point sizes]), [ if test "$withval" != "no" >/dev/null 2>&1 ; then AC_DEFINE(FONTFORGE_CONFIG_DEVICETABLES) |