--- /dev/null	2005-07-26 11:11:16.000000000 -0600
+++ util/gccmakedep/configure.ac	2005-10-18 19:49:42.421503680 -0600
@@ -0,0 +1,36 @@
+
+dnl  Copyright 2005 Red Hat, Inc.
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software and its
+dnl  documentation for any purpose is hereby granted without fee, provided that
+dnl  the above copyright notice appear in all copies and that both that
+dnl  copyright notice and this permission notice appear in supporting
+dnl  documentation, and that the name of Red Hat not be used in
+dnl  advertising or publicity pertaining to distribution of the software without
+dnl  specific, written prior permission.  Red Hat makes no
+dnl  representations about the suitability of this software for any purpose.  It
+dnl  is provided "as is" without express or implied warranty.
+dnl 
+dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl  PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.57])
+AC_INIT(gccmakedep,[0.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],gccmakedep)
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+AC_PROG_INSTALL
+AC_PROG_CC
+
+XORG_PROG_RAWCPP
+
+XORG_RELEASE_VERSION
+
+AC_OUTPUT([Makefile])
--- /dev/null	2005-07-26 11:11:16.000000000 -0600
+++ util/gccmakedep/Makefile.am	2005-10-18 20:13:50.356384120 -0600
@@ -0,0 +1,44 @@
+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  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 Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT 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.
+
+gccmakedep_DATA = gccmakedep
+gccmakedepdir = $(bindir)
+
+EXTRA_DIST = gccmdep.cpp
+
+include cpprules.in
+
+DEFS = \
+	-DCCCMD=$(CC)\
+	-DRMCMD="rm"\
+	-DLNCMD="ln"\
+	-DMVCMD="mv"
+
+CPP_FILES_FLAGS = $(DEFS)
+
+dist_man1_MANS = gccmakedep.man
+
+gccmakedep: gccmdep
+	mv gccmdep gccmakedep
+install-data-hook:
+	chmod +x $(DESTDIR)/$(bindir)/gccmakedep
+
+CLEANFILES = gccmakedep
--- /dev/null	2005-07-26 11:11:16.000000000 -0600
+++ util/gccmakedep/cpprules.in	2005-10-18 17:43:44.867426536 -0600
@@ -0,0 +1,26 @@
+#							-*- Makefile -*-
+# Rules for generating files using the C pre-processor
+# (Replaces CppFileTarget from Imake)
+
+SED = sed
+
+SUFFIXES = .cpp
+
+WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
+
+# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
+# to cpp, because that trick does not work on all ANSI C preprocessors.
+# Delete line numbers from the cpp output (-P is not portable, I guess).
+# Allow XCOMM to be preceded by whitespace and provide a means of generating
+# output lines with trailing backslashes.
+# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
+
+CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
+                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
+                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
+                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e '/\@\@$$/s/\@\@$$/\\/'
+
+.cpp:
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
--- util/modular/symlink.sh.old	2005-10-18 20:19:03.139833808 -0600
+++ util/modular/symlink.sh	2005-10-18 20:22:02.241606200 -0600
@@ -12748,6 +12748,14 @@
     action	xprint_host.def
 }
 
+symlink_util_gccmakedep() {
+    src_dir config/util
+    dst_dir util/gccmakedep
+
+    action	gccmdep.cpp
+    action	gccmakedep.man
+}
+
 symlink_util_imake() {
     src_dir config/imake
     dst_dir util/imake
@@ -12779,6 +12787,7 @@
 
 symlink_util() {
     symlink_util_cf
+    symlink_util_gccmakedep
     symlink_util_imake
     symlink_util_makedepend
     symlink_util_xmkmf