Remove fontconf.h

This file used to advertise which font formats the library supports. The X server doesn't care, so let's just remove it so that it doesn't conflict with the older version of libXfont Signed-off-by: Keith Packard <keithp@keithp.com>
EMGD-Community · Dec 11, 2015 · 95a4055 · 95a4055
1 parent 903cd14
commit 95a4055
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,3 +76,6 @@ core
 #		Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 # 
+*.sig
+*.announce
+TAGS
diff --git a/Makefile.am b/Makefile.am
@@ -42,9 +42,6 @@ noinst_HEADERS = \
 	src/FreeType/ft.h	     \
 	src/FreeType/ftfuncs.h
 
-nodist_libXfontinclude_HEADERS = \
-	include/X11/fonts/fontconf.h
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xfont2.pc
 

diff --git a/configure.ac b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.60])
 AC_INIT([libXfont2], [2.0.0],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont2])
 AC_CONFIG_SRCDIR([Makefile.am])
-AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize Automake

diff --git a/include/X11/fonts/.gitignore b/include/X11/fonts/.gitignore
diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in