diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-16 21:35:26 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-16 21:35:26 +0000 |
| commit | e5525d268c6165318894f326be445b22a2523558 (patch) | |
| tree | d33dbfaebfb97d8f8a09eef8179c32978cfe101e | |
| parent | b96f539005da57273dc7e2bee13651de4eedf087 (diff) | |
Add Speedo directory to Xfont
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/Speedo/Makefile.am | 32 | ||||
| -rw-r--r-- | src/Speedo/spfont.c | 2 |
4 files changed, 44 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 3f6fcee..65b40fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,10 +58,10 @@ TYPE1_DIR = src/Type1 TYPE1_LIB = src/Type1/libtype1.la endif -# if XFONT_SPEEDO -# SPEEDO_DIR = src/Speedo -# SPEEDO_LIB = src/Speedo/libspeedo.la -# endif +if XFONT_SPEEDO +SPEEDO_DIR = src/Speedo +SPEEDO_LIB = src/Speedo/libspeedo.la +endif UTIL_DIR = src/util UTIL_LIB = src/util/libutil.la diff --git a/configure.ac b/configure.ac index 58090f4..6297ac9 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,12 @@ if test "x$XFONT_TYPE1" = xyes; then AC_DEFINE(XFONT_TYPE1,1,[Support Type 1 font files]) fi +AC_ARG_ENABLE(speedo, [ --disable-speedo ], [XFONT_SPEEDO=$enableval], [XFONT_SPEEDO=yes]) +AM_CONDITIONAL(XFONT_SPEEDO, [test "x$XFONT_SPEEDO" = xyes ]) +if test "x$XFONT_SPEEDO" = xyes; then + AC_DEFINE(XFONT_SPEEDO,1,[Support Type 1 font files]) +fi + if test "x$XFONT_BULITINS" = xyes -o "x$XFONT_BITMAP" = xyes -o "x$XFONT_FREETYPE" = xyes; then XFONT_FONTFILE=yes else @@ -152,6 +158,7 @@ AC_OUTPUT([Makefile src/builtins/Makefile src/bitmap/Makefile src/Type1/Makefile + src/Speedo/Makefile src/fc/Makefile src/util/Makefile src/stubs/Makefile diff --git a/src/Speedo/Makefile.am b/src/Speedo/Makefile.am new file mode 100644 index 0000000..e7dfff4 --- /dev/null +++ b/src/Speedo/Makefile.am @@ -0,0 +1,32 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts + +noinst_LTLIBRARIES = libspeedo.la + +libspeedo_la_SOURCES = \ + adobe-iso.h \ + bics-iso.h \ + bics-unicode.c \ + bics-unicode.h \ + do_char.c \ + do_trns.c \ + keys.h \ + out_bl2d.c \ + out_blk.c \ + out_outl.c \ + out_scrn.c \ + out_util.c \ + reset.c \ + set_spcs.c \ + set_trns.c \ + spdo_prv.h \ + speedo.h \ + spencode.c \ + sperr.c \ + spfile.c \ + spfont.c \ + spfuncs.c \ + spglyph.c \ + spinfo.c \ + spint.h \ + useropt.h diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c index c430f6e..684caaf 100644 --- a/src/Speedo/spfont.c +++ b/src/Speedo/spfont.c @@ -55,7 +55,7 @@ from The Open Group. * Speedo font loading */ -#include "FSproto.h" +#include <X11/fonts/FSproto.h> #include "spint.h" #include "fontutil.h" #ifndef FONTMODULE |