- Remove fontenc from Xfont

- Add a dependency from Xfont on libfontenc
- Add build system for lib/fontenc
- xc/lib/font: Change #include "fontenc.h" to #include
    <X11/fonts/fontenc.h> in some places.
- Remove dpsinfo and dpsexec from the app section of symlink.sh
- Fix xp.pc.in to add XPRINT_LIBS/CFLAGS instead of X_LIBS/CFLAGS

Makefile.am

@@ -71,7 +71,7 @@ STUBS_DIR = src/stubs
 
 SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
 	$(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) \
-	$(TYPE1_DIR) $(SPEEDO_DIR) src/fontenc
+	$(TYPE1_DIR) $(SPEEDO_DIR)
 
 libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \
 	$(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \
@@ -93,7 +93,6 @@ libXfontinclude_HEADERS = \
 	include/X11/fonts/fntfilio.h \
 	include/X11/fonts/fntfilst.h \
 	include/X11/fonts/fontconf.h \
-	include/X11/fonts/fontenc.h  \
 	include/X11/fonts/fontencc.h \
 	include/X11/fonts/fontmisc.h \
 	include/X11/fonts/fontmod.h  \

configure.ac

@@ -126,6 +126,7 @@ fi
 AM_CONDITIONAL(XFONT_FONTFILE, [test "x$XFONT_FONTFILE" = xyes])
 if test "x$XFONT_FONTFILE" = xyes; then
 	AC_DEFINE(XFONT_FONTFILE,,[Support fonts in files])
+
 fi
 
 AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz
@@ -139,7 +140,7 @@ AC_SUBST(X_GZIP_FONT_COMPRESSION)
 AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
 AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
 
-PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto)
+PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc)
 
 if test "x$GCC" = "xyes"; then
 	GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
@@ -162,5 +163,4 @@ AC_OUTPUT([Makefile
 	   src/fc/Makefile
 	   src/util/Makefile
 	   src/stubs/Makefile
-	   src/fontenc/Makefile
            xfont.pc])

src/Type1/t1funcs.c

@@ -133,7 +133,7 @@ from The Open Group.
 #include "fntfilst.h"
 #include "fontutil.h"
 #include <X11/fonts/FSproto.h>
-#include "fontenc.h"
+#include <X11/fonts/fontenc.h>
 #include "t1unicode.h"
 
 #ifdef BUILDCID

src/fontfile/Makefile.am

@@ -16,13 +16,10 @@ libfontfile_la_SOURCES = 	\
 	decompress.c		\
 	defaults.c		\
 	dirfile.c		\
-	encparse.c		\
 	ffcheck.c		\
 	fileio.c		\
 	filewr.c		\
 	fontdir.c		\
-	fontenc.c		\
-	fontencI.h		\
 	fontencc.c		\
 	fontfile.c		\
 	fontscale.c		\

src/fontfile/fontencc.c

@@ -28,7 +28,7 @@ THE SOFTWARE.
    *not* provide source compatibility, as many of the data structures
    now have different names. */
 
-#include "fontenc.h"
+#include <X11/fonts/fontenc.h>
 #include "fontencc.h"
 
 extern void ErrorF(const char *f, ...);