Attachment #98419 for bug #138623




AC_PROG_LEX
AC_PROG_YACC
XORG_PROG_RAWCPP
AC_PATH_PROG(SED,sed)

AC_HEADER_DIRENT
AC_HEADER_STDC


AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
++ hw/xfree86/xorgconf.cpp     2006-09-29 19:02:07.000000000 -0600


    FontPath	LOCALFONTPATH
    FontPath	MISCFONTPATH
    FontPath	DPI75USFONTPATH
    FontPath	DPI100USFONTPATH
    FontPath	T1FONTPATH
    FontPath	TRUETYPEFONTPATH
    FontPath	CIDFONTPATH




optionsdir = $(libdir)/X11
dist_options_DATA = Options

BUILT_SOURCES = xorg.conf.example
CLEAN = xorg.conf.example
EXTRA_DIST = xorgconf.cpp

# CPP stuff stolen from the xinit package.

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/\@\@$$/\\/'

CONFDEFS = \
	-DRGBPATH=\"$(RGB_DB)\" \
	-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
	-DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
	-DSPFONTPATH="\"$(BASE_FONT_PATH)/SP\"" \
	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"

relink:
	rm -f Xorg && $(MAKE) Xorg

xorg.conf.example: xorgconf.cpp
	$(RAWCPP) $(CONFDEFS) < xorgconf.cpp | $(CPP_SED_MAGIC) > $@

Return to bug 138623

Lines 64-69 Link Here

(-)configure.ac.old (-4 / +4 lines)
64	AC_PROG_LEX	64	AC_PROG_LEX
65	AC_PROG_YACC	65	AC_PROG_YACC
66	XORG_PROG_RAWCPP	66	XORG_PROG_RAWCPP
		67	AC_PATH_PROG(SED,sed)
67		68
68	AC_HEADER_DIRENT	69	AC_HEADER_DIRENT
69	AC_HEADER_STDC	70	AC_HEADER_STDC
Lines 806-811 Link Here
806		806
807	AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])	807	AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
808	AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])	808	AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
		809	AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
809	AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])	810	AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
810	AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])	811	AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
811	AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])	812	AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name])
812	-- hw/xfree86/xorgconf.cpp.old 2006-09-29 19:02:00.000000000 -0600	813	++ hw/xfree86/xorgconf.cpp 2006-09-29 19:02:07.000000000 -0600
Lines 54-61 Link Here
54		54
55	FontPath LOCALFONTPATH	55	FontPath LOCALFONTPATH
56	FontPath MISCFONTPATH	56	FontPath MISCFONTPATH
57	FontPath DPI75USFONTPATH
58	FontPath DPI100USFONTPATH
59	FontPath T1FONTPATH	57	FontPath T1FONTPATH
60	FontPath TRUETYPEFONTPATH	58	FontPath TRUETYPEFONTPATH
61	FontPath CIDFONTPATH	59	FontPath CIDFONTPATH

Lines 75-81 Link Here

(-)hw/xfree86/Makefile.am.old (+26 lines)
75	optionsdir = $(libdir)/X11	75	optionsdir = $(libdir)/X11
76	dist_options_DATA = Options	76	dist_options_DATA = Options
77		77
		78	BUILT_SOURCES = xorg.conf.example
		79	CLEAN = xorg.conf.example
78	EXTRA_DIST = xorgconf.cpp	80	EXTRA_DIST = xorgconf.cpp
79		81
		82	# CPP stuff stolen from the xinit package.
		83
		84	CPP_SED_MAGIC = $(SED) -e '/^\# [0-9][0-9] .$$/d' \
		85	-e '/^\#line [0-9][0-9] .$$/d' \
		86	-e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
		87	-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
		88	-e '/^[ ]*XHASH/s/XHASH/\#/' \
		89	-e '/\@\@$$/s/\@\@$$/\\/'
		90
		91	CONFDEFS = \
		92	-DRGBPATH=\"$(RGB_DB)\" \
		93	-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
		94	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
		95	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
		96	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
		97	-DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
		98	-DSPFONTPATH="\"$(BASE_FONT_PATH)/SP\"" \
		99	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
		100	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
		101	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
		102
80	relink:	103	relink:
81	rm -f Xorg && $(MAKE) Xorg	104	rm -f Xorg && $(MAKE) Xorg
		105
		106	xorg.conf.example: xorgconf.cpp
		107	$(RAWCPP) $(CONFDEFS) < xorgconf.cpp \| $(CPP_SED_MAGIC) > $@