Attachment #98424 for bug #138623





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

Lines 1-3 Link Here

(-)hw/xfree86/Makefile.am.old (+19 lines)
		1	include $(top_srcdir)/cpprules.in
		2
1	if DRI	3	if DRI
2	DRI_SUBDIR = dri	4	DRI_SUBDIR = dri
3	endif	5	endif
Lines 75-81 Link Here
75	optionsdir = $(libdir)/X11	77	optionsdir = $(libdir)/X11
76	dist_options_DATA = Options	78	dist_options_DATA = Options
77		79
		80	BUILT_SOURCES = xorg.conf.example
		81	CLEAN = xorg.conf.example xorg.conf.example.pre
78	EXTRA_DIST = xorgconf.cpp	82	EXTRA_DIST = xorgconf.cpp
79		83
		84	CPP_FILES_FLAGS = \
		85	-DRGBPATH=\"$(RGB_DB)\" \
		86	-DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \
		87	-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \
		88	-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
		89	-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
		90	-DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \
		91	-DSPFONTPATH="\"$(BASE_FONT_PATH)/SP\"" \
		92	-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \
		93	-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \
		94	-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
		95
80	relink:	96	relink:
81	rm -f Xorg && $(MAKE) Xorg	97	rm -f Xorg && $(MAKE) Xorg
		98
		99	xorg.conf.example.pre: xorgconf.cpp
		100	cp $< $@

Return to bug 138623

Lines 806-811 Link Here

(-)configure.ac.old (-4 / +3 lines)
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