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>

5 files changed, 4 insertions, 55 deletions

diff --git a/.gitignore b/.gitignore
index 183f4b6..2efa153 100644
--- 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
index 86870bb..c1a3db2 100644
--- 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
index f331b93..a13e7bd 100644
--- 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
deleted file mode 100644
index b571690..0000000
--- a/include/X11/fonts/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#		Add & Override for this directory and it's subdirectories
-fontconf.h
diff --git a/include/X11/fonts/fontconf.h.in b/include/X11/fonts/fontconf.h.in
deleted file mode 100644
index 67783d3..0000000
--- a/include/X11/fonts/fontconf.h.in
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2005 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Define as 1 if you have FreeType support in Xfont */
-#undef XFONT_FREETYPE
-
-/* Define as 1 if you have builtin font support in Xfont */
-#undef XFONT_BUILTINS
-
-/* Define as 1 if you have pcf font support in Xfont */
-#undef XFONT_PCFFORMAT
-
-/* Define as 1 if you have bdf font support in Xfont */
-#undef XFONT_BDFFORMAT
-
-/* Define as 1 if you have snf font support in Xfont */
-#undef XFONT_SNFFORMAT
-
-/* Define as 1 if you have bitmap font support in Xfont */
-#undef XFONT_BITMAP
-
-/* Define as 1 if you have fontfile support in Xfont */
-#undef XFONT_FONTFILE
-
-/* Define as 1 if you have font cache support in Xfont */
-#undef XFONT_FONTCACHE
-
-/* Define as 1 if you have X Font Services Protocol support in Xfont */
-#undef XFONT_FC
-