Add Type1 subdirectory to lib/Xfonts, update build system accordingly.

8 files changed, 93 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 178e918..3f6fcee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,16 @@ FC_DIR = src/fc
 FC_LIB = src/fc/libfc.la
 endif
 
+if XFONT_TYPE1
+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
+
 UTIL_DIR = src/util
 UTIL_LIB = src/util/libutil.la
 
@@ -60,11 +70,13 @@ STUBS_LIB = src/stubs/libstubs.la
 STUBS_DIR = src/stubs
 
 SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
-	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR)
+	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) \
+	$(TYPE1_DIR) $(SPEEDO_DIR)
 
 libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \
 	$(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \
-	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(FONTCACHE_LIB)
+	$(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(FONTCACHE_LIB) \
+	$(TYPE_1_LIB) $(SPEEDO_LIB)
 
 libXfont_la_SOURCES =
 
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 077ae46..58090f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,12 @@ if test "x$XFONT_BITMAP" = xyes; then
 	AC_DEFINE(XFONT_BITMAP,1,[Support bitmap font files])
 fi
 
+AC_ARG_ENABLE(type1, [ --disable-type1 ], [XFONT_TYPE1=$enableval], [XFONT_TYPE1=yes])
+AM_CONDITIONAL(XFONT_TYPE1, [test "x$XFONT_TYPE1" = xyes ])
+if test "x$XFONT_TYPE1" = xyes; then
+	AC_DEFINE(XFONT_TYPE1,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
@@ -145,6 +151,7 @@ AC_OUTPUT([Makefile
 	   src/FreeType/Makefile
 	   src/builtins/Makefile
 	   src/bitmap/Makefile
+	   src/Type1/Makefile
 	   src/fc/Makefile
 	   src/util/Makefile
 	   src/stubs/Makefile
diff --git a/src/Type1/Makefile.am b/src/Type1/Makefile.am
new file mode 100644
index 0000000..eada3eb
--- /dev/null
+++ b/src/Type1/Makefile.am
@@ -0,0 +1,55 @@
+INCLUDES =			\
+	-I${top_srcdir}/include/X11/fonts
+
+noinst_LTLIBRARIES = libtype1.la
+
+libtype1_la_SOURCES =			\
+		afm.c			\
+		AFM.h			\
+		arith.c			\
+		arith.h			\
+		blues.h			\
+		cidchar.c		\
+		cluts.h			\
+		curves.c		\
+		curves.h		\
+		digit.h			\
+		fontfcn.c		\
+		fontfcn.h		\
+		fonts.h			\
+		hdigit.h		\
+		hints.c			\
+		hints.h			\
+		lines.c			\
+		lines.h			\
+		objects.c		\
+		objects.h		\
+		paths.c			\
+		paths.h			\
+		pictures.h		\
+		range.h			\
+		regions.c		\
+		regions.h		\
+		scanfont.c		\
+		spaces.c		\
+		spaces.h		\
+		strokes.h		\
+		t1funcs.c		\
+		t1hdigit.h		\
+		t1imager.h		\
+		t1info.c		\
+		t1intf.h		\
+		t1io.c			\
+		t1malloc.c		\
+		t1snap.c		\
+		t1stdio.h		\
+		t1stub.c		\
+		t1unicode.c		\
+		t1unicode.h		\
+		token.c			\
+		token.h			\
+		tokst.h			\
+		trig.h			\
+		type1.c			\
+		util.c			\
+		util.h
diff --git a/src/Type1/objects.h b/src/Type1/objects.h
index 59a22d6..348297b 100644
--- a/src/Type1/objects.h
+++ b/src/Type1/objects.h
@@ -47,8 +47,8 @@
 /*SHARED*/
  
 /*END SHARED*/
-#include <Xdefs.h>
-#include <Xfuncproto.h>
+#include <X11/Xdefs.h>
+#include <X11/Xfuncproto.h>
 #ifndef FONTMODULE
 #include <stdlib.h>
 #endif
diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c
index 076c00b..ef99b93 100644
--- a/src/Type1/t1funcs.c
+++ b/src/Type1/t1funcs.c
@@ -132,7 +132,7 @@ from The Open Group.
 
 #include "fntfilst.h"
 #include "fontutil.h"
-#include "FSproto.h"
+#include <X11/fonts/FSproto.h>
 #include "fontenc.h"
 #include "t1unicode.h"
  
diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c
index f6a5012..aa00aca 100644
--- a/src/Type1/t1info.c
+++ b/src/Type1/t1info.c
@@ -111,7 +111,7 @@ from The Open Group.
 #else
 #include "xf86_ansic.h"
 #endif
-#include "FSproto.h"
+#include <X11/fonts/FSproto.h>
 
 #ifdef BUILDCID
 #ifndef FONTMODULE
diff --git a/src/Type1/t1io.c b/src/Type1/t1io.c
index 0843ae1..ac09b54 100644
--- a/src/Type1/t1io.c
+++ b/src/Type1/t1io.c
@@ -58,7 +58,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #else
-#include "Xdefs.h"	/* Bool declaration */
 #include "Xmd.h"	/* INT32 declaration */
 #include "xf86_ansic.h"
 #endif
@@ -67,7 +66,7 @@
 #ifdef WIN32
 #include <X11/Xw32defs.h>
 #endif
-#include "Xdefs.h"
+#include <X11/Xdefs.h>
 
 /* Constants and variables used in the decryption */
 #define c1 ((unsigned short)52845)