Commit c893f974277359b6fe930822013f2bbbe6fb7b2e - x11-apps

xmag 1.0.3 Brice Goglin 14 years ago

11 changed file(s) with 1736 addition(s) and 380 deletion(s). Raw diff Collapse all Expand all

-1

debian/changelog less more

0	0	x11-apps (7.4+3) UNRELEASED; urgency=low
1	1
	2	[ Julien Cristau ]
2	3	* Update xload config.{guess,sub}, adding avr32 support (closes: #536410)
3	4
4		-- Julien Cristau <jcristau@debian.org> Sun, 02 Aug 2009 16:10:47 +0200
	5	[ Brice Goglin ]
	6	* xmag 1.0.3.
	7
	8	-- Brice Goglin <bgoglin@debian.org> Fri, 04 Sep 2009 13:41:15 +0200
5	9
6	10	x11-apps (7.4+2) unstable; urgency=low
7	11

+46

-0

xmag/ChangeLog less more

	0	commit f1f2af7a65d6531814a06b292a28bdc46580e590
	1	Author: Alan Coopersmith <alan.coopersmith@sun.com>
	2	Date: Mon Aug 3 11:19:07 2009 -0700
	3
	4	Version bump: 1.0.3
	5
	6	Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
	7
	8	commit 90ccae7efc5fca9c0f4e45b84806df01332dd869
	9	Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
	10	Date: Mon Jan 12 20:41:14 2009 -0200
	11
	12	Correct problems in make distcheck.
	13
	14	commit ae94046d8654b9f65df871502de0f08a36aa5d38
	15	Author: Julien Cristau <jcristau@debian.org>
	16	Date: Tue Aug 19 01:04:40 2008 +0200
	17
	18	xaw8 is gone, use xaw7
	19
	20	commit 7ac72ce2e262bf78cb2e8ff50ef932d29e4b65f7
	21	Author: Julien Cristau <jcristau@debian.org>
	22	Date: Tue Aug 19 01:04:27 2008 +0200
	23
	24	allow build outside of source tree
	25
	26	commit a3e1a9b4cb732b86b84375013e3fa531395b45cf
	27	Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
	28	Date: Tue Jul 29 14:18:10 2008 -0300
	29
	30	Properly handle multiple depth windows.
	31
	32	This patch will not cause X Errors when magnifying windows with portions
	33	offscreen, or windows with a dimension smaller than the default 64x64.
	34
	35	A common case where this patch is required is when Composite is enabled,
	36	the default depth has a value other than 24, and some application is
	37	using the Composite argb visual; example is WindowMaker, that will choose
	38	the "best" available visual, unless the visual-id option is used.
	39
	40	commit cb21acd94353c82c4b49a7ddef99309b31b07500
	41	Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
	42	Date: Thu Mar 27 20:08:04 2008 -0700
	43
	44	Build fix for file systems that are not case sensitive
	45
0	46	commit a6b0036a082a947b89bdbb27128e20079799857c
1	47	Author: Alan Coopersmith <alan.coopersmith@sun.com>
2	48	Date: Wed Aug 15 18:04:12 2007 -0700

-18

xmag/Makefile.am less more

39	39
40	40	# App default files (*.ad)
41	41
	42	DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
	43
42	44	appdefaultdir = @appdefaultdir@
43	45
44
45		APPDEFAULTFILES = \
46		Xmag
47
48		SUFFIXES = .ad
49
50		.ad:
51		cp $< $@
52
53		appdefault_DATA = $(APPDEFAULTFILES)
54
55		EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
56
57		CLEANFILES = $(APPDEFAULTFILES)
	46	dist_appdefault_DATA = \
	47	app-defaults/Xmag
58	48
59	49	# Developer documentation for Scale widget in Scale.c
60		EXTRA_DIST += Scale.txt
	50	EXTRA_DIST = Scale.txt
61	51
62	52	EXTRA_DIST += xmag.icon
63	53

66	56	appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
67	57
68	58	EXTRA_DIST += $(appman_PRE)
69		CLEANFILES += $(appman_DATA)
	59	CLEANFILES = $(appman_DATA)
70	60
71	61	SED = sed
72	62

87	77	-e 's\|__miscmansuffix__\|$(MISC_MAN_SUFFIX)\|g' \
88	78	-e 's\|__filemansuffix__\|$(FILE_MAN_SUFFIX)\|g'
89	79
90		SUFFIXES += .$(APP_MAN_SUFFIX) .man
	80	SUFFIXES = .$(APP_MAN_SUFFIX) .man
91	81
92	82	.man.$(APP_MAN_SUFFIX):
93	83	sed $(MAN_SUBSTS) < $< > $@

98	88	.PHONY: ChangeLog
99	89
100	90	ChangeLog:
101		(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \|\| (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
	91	$(CHANGELOG_CMD)
102	92
103	93	dist-hook: ChangeLog

+58

-58

xmag/Makefile.in less more

55	55	host_triplet = @host@
56	56	bin_PROGRAMS = xmag$(EXEEXT)
57	57	subdir = .
58		DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
59		$(srcdir)/Makefile.in $(srcdir)/config.h.in \
60		$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
61		config.guess config.sub depcomp install-sh missing
	58	DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
	59	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
	60	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
	61	ChangeLog INSTALL NEWS config.guess config.sub depcomp \
	62	install-sh missing
62	63	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63	64	am__aclocal_m4_deps = $(top_srcdir)/configure.ac
64	65	am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

68	69	mkinstalldirs = $(install_sh) -d
69	70	CONFIG_HEADER = config.h
70	71	CONFIG_CLEAN_FILES =
71		am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
72		"$(DESTDIR)$(appmandir)"
	72	am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
	73	"$(DESTDIR)$(appdefaultdir)"
73	74	binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
74	75	PROGRAMS = $(bin_PROGRAMS)
75	76	am_xmag_OBJECTS = CutPaste.$(OBJEXT) RootWin.$(OBJEXT) Scale.$(OBJEXT) \

92	93	*) f=$$p;; \
93	94	esac;
94	95	am__strip_dir = `echo $$p \| sed -e 's\|^.*/\|\|'`;
95		appdefaultDATA_INSTALL = $(INSTALL_DATA)
96	96	appmanDATA_INSTALL = $(INSTALL_DATA)
97		DATA = $(appdefault_DATA) $(appman_DATA)
	97	dist_appdefaultDATA_INSTALL = $(INSTALL_DATA)
	98	DATA = $(appman_DATA) $(dist_appdefault_DATA)
98	99	ETAGS = etags
99	100	CTAGS = ctags
100	101	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

107	108	DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
108	109	GZIP_ENV = --best
109	110	distuninstallcheck_listfiles = find . -type f -print
110		distcleancheck_listfiles = find . -type f -print
111	111	ACLOCAL = @ACLOCAL@
112	112	ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
113	113	ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@

123	123	CC = @CC@
124	124	CCDEPMODE = @CCDEPMODE@
125	125	CFLAGS = @CFLAGS@
	126	CHANGELOG_CMD = @CHANGELOG_CMD@
	127	CPP = @CPP@
126	128	CPPFLAGS = @CPPFLAGS@
	129	CWARNFLAGS = @CWARNFLAGS@
127	130	CYGPATH_W = @CYGPATH_W@
128	131	DEFS = @DEFS@
129	132	DEPDIR = @DEPDIR@

132	135	ECHO_C = @ECHO_C@
133	136	ECHO_N = @ECHO_N@
134	137	ECHO_T = @ECHO_T@
	138	EGREP = @EGREP@
135	139	EXEEXT = @EXEEXT@
136	140	FILE_MAN_DIR = @FILE_MAN_DIR@
137	141	FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
	142	GREP = @GREP@
138	143	INSTALL = @INSTALL@
139	144	INSTALL_DATA = @INSTALL_DATA@
140	145	INSTALL_PROGRAM = @INSTALL_PROGRAM@

163	168	SET_MAKE = @SET_MAKE@
164	169	SHELL = @SHELL@
165	170	STRIP = @STRIP@
166		TMP_XAW_CFLAGS = @TMP_XAW_CFLAGS@
167		TMP_XAW_LIBS = @TMP_XAW_LIBS@
168	171	VERSION = @VERSION@
169	172	XMAG_CFLAGS = @XMAG_CFLAGS@
170	173	XMAG_LIBS = @XMAG_LIBS@

178	181	am__quote = @am__quote@
179	182	am__tar = @am__tar@
180	183	am__untar = @am__untar@
181
182		# App default files (*.ad)
183	184	appdefaultdir = @appdefaultdir@
184	185	bindir = @bindir@
185	186	build = @build@

190	191	builddir = @builddir@
191	192	datadir = @datadir@
192	193	datarootdir = @datarootdir@
	194	distcleancheck_listfiles = @distcleancheck_listfiles@
193	195	docdir = @docdir@
194	196	dvidir = @dvidir@
195	197	exec_prefix = @exec_prefix@

236	238	appman_PRE = \
237	239	xmag.man
238	240
239		APPDEFAULTFILES = \
240		Xmag
241
242		SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
243		appdefault_DATA = $(APPDEFAULTFILES)
	241
	242	# App default files (*.ad)
	243	DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
	244	dist_appdefault_DATA = \
	245	app-defaults/Xmag
	246
244	247
245	248	# Developer documentation for Scale widget in Scale.c
246		EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) Scale.txt xmag.icon \
247		$(appman_PRE) ChangeLog
248		CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
	249	EXTRA_DIST = Scale.txt xmag.icon $(appman_PRE) ChangeLog
249	250	appmandir = $(APP_MAN_DIR)
250	251	appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
	252	CLEANFILES = $(appman_DATA)
251	253	SED = sed
252	254
253	255	# Strings to replace in man pages

266	268	-e 's\|__miscmansuffix__\|$(MISC_MAN_SUFFIX)\|g' \
267	269	-e 's\|__filemansuffix__\|$(FILE_MAN_SUFFIX)\|g'
268	270
	271	SUFFIXES = .$(APP_MAN_SUFFIX) .man
269	272	MAINTAINERCLEANFILES = ChangeLog
270	273	all: config.h
271	274	$(MAKE) $(AM_MAKEFLAGS) all-am
272	275
273	276	.SUFFIXES:
274		.SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
	277	.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
275	278	am--refresh:
276	279	@:
277	280	$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)

373	376	@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
374	377	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
375	378	@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
376		install-appdefaultDATA: $(appdefault_DATA)
377		@$(NORMAL_INSTALL)
378		test -z "$(appdefaultdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(appdefaultdir)"
379		@list='$(appdefault_DATA)'; for p in $$list; do \
380		if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
381		f=$(am__strip_dir) \
382		echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
383		$(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
384		done
385
386		uninstall-appdefaultDATA:
387		@$(NORMAL_UNINSTALL)
388		@list='$(appdefault_DATA)'; for p in $$list; do \
389		f=$(am__strip_dir) \
390		echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
391		rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
392		done
393	379	install-appmanDATA: $(appman_DATA)
394	380	@$(NORMAL_INSTALL)
395	381	test -z "$(appmandir)" \|\| $(MKDIR_P) "$(DESTDIR)$(appmandir)"

406	392	f=$(am__strip_dir) \
407	393	echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
408	394	rm -f "$(DESTDIR)$(appmandir)/$$f"; \
	395	done
	396	install-dist_appdefaultDATA: $(dist_appdefault_DATA)
	397	@$(NORMAL_INSTALL)
	398	test -z "$(appdefaultdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(appdefaultdir)"
	399	@list='$(dist_appdefault_DATA)'; for p in $$list; do \
	400	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
	401	f=$(am__strip_dir) \
	402	echo " $(dist_appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
	403	$(dist_appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
	404	done
	405
	406	uninstall-dist_appdefaultDATA:
	407	@$(NORMAL_UNINSTALL)
	408	@list='$(dist_appdefault_DATA)'; for p in $$list; do \
	409	f=$(am__strip_dir) \
	410	echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
	411	rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
409	412	done
410	413
411	414	ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

588	591	check: check-am
589	592	all-am: Makefile $(PROGRAMS) $(DATA) config.h
590	593	installdirs:
591		for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)"; do \
	594	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)"; do \
592	595	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
593	596	done
594	597	install: install-am

638	641
639	642	info-am:
640	643
641		install-data-am: install-appdefaultDATA install-appmanDATA
	644	install-data-am: install-appmanDATA install-dist_appdefaultDATA
642	645
643	646	install-dvi: install-dvi-am
644	647

675	678
676	679	ps-am:
677	680
678		uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
679		uninstall-binPROGRAMS
	681	uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
	682	uninstall-dist_appdefaultDATA
680	683
681	684	.MAKE: install-am install-strip
682	685

686	689	distclean distclean-compile distclean-generic distclean-hdr \
687	690	distclean-tags distcleancheck distdir distuninstallcheck dvi \
688	691	dvi-am html html-am info info-am install install-am \
689		install-appdefaultDATA install-appmanDATA install-binPROGRAMS \
690		install-data install-data-am install-dvi install-dvi-am \
691		install-exec install-exec-am install-html install-html-am \
692		install-info install-info-am install-man install-pdf \
693		install-pdf-am install-ps install-ps-am install-strip \
694		installcheck installcheck-am installdirs maintainer-clean \
695		maintainer-clean-generic mostlyclean mostlyclean-compile \
696		mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
697		uninstall-am uninstall-appdefaultDATA uninstall-appmanDATA \
698		uninstall-binPROGRAMS
699
700
701		.ad:
702		cp $< $@
	692	install-appmanDATA install-binPROGRAMS install-data \
	693	install-data-am install-dist_appdefaultDATA install-dvi \
	694	install-dvi-am install-exec install-exec-am install-html \
	695	install-html-am install-info install-info-am install-man \
	696	install-pdf install-pdf-am install-ps install-ps-am \
	697	install-strip installcheck installcheck-am installdirs \
	698	maintainer-clean maintainer-clean-generic mostlyclean \
	699	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
	700	tags uninstall uninstall-am uninstall-appmanDATA \
	701	uninstall-binPROGRAMS uninstall-dist_appdefaultDATA
	702
703	703
704	704	.man.$(APP_MAN_SUFFIX):
705	705	sed $(MAN_SUBSTS) < $< > $@

707	707	.PHONY: ChangeLog
708	708
709	709	ChangeLog:
710		(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \|\| (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
	710	$(CHANGELOG_CMD)
711	711
712	712	dist-hook: ChangeLog
713	713	# Tell versions [3.59,3.63) of GNU make to not export all variables.

-27

~~xmag/Xmag.ad~~ less more

0		! $Xorg: Xmag.ad,v 1.3 2000/08/17 19:54:54 cpqbld Exp $
1		! $XFree86$
2		*Font: fixed
3		pane2orientation: horizontal
4		pane2showGrip: False
5		*allowShellResize: on
6		*Scale.baseTranslations:#augment\
7		<EnterWindow>: set-colors()\n\
8		<LeaveWindow>: unset-colors()\n\
9		<Btn1Down>:popup-pixel()\n\
10		Button1<Enter>:popup-pixel()\n\
11		<Btn1Motion>:update-pixel()\n\
12		<Btn1Up>:popdown-pixel()\n\
13		<Leave>:popdown-pixel()\n\
14		<Key>n:new()\n\
15		<Key>q:close()\n\
16		Ctrl<Key>c:close()\n\
17		<Key>space:replace()
18		*close.accelerators:#augment\
19		<Key>q:set()notify()unset()\n\
20		Ctrl<Key>c:set()notify()unset()
21		*replace.accelerators:#augment\
22		<Key>space:set()notify()unset()\n\
23		<Btn2Up>:set()notify()unset()\n\
24		<Btn3Up>:set()notify()unset()
25		*helpLabel.font: 8x13bold
26		*helpLabel.label: xmag

+608

-87

xmag/aclocal.m4 less more

14	14	[m4_fatal([this file was generated for autoconf 2.61.
15	15	You have another version of autoconf. If you want to use that,
16	16	you should regenerate the build system entirely.], [63])])
	17
	18	dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
	19	dnl
	20	dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
	21	dnl
	22	dnl Permission is hereby granted, free of charge, to any person obtaining a
	23	dnl copy of this software and associated documentation files (the
	24	dnl "Software"), to deal in the Software without restriction, including
	25	dnl without limitation the rights to use, copy, modify, merge, publish,
	26	dnl distribute, and/or sell copies of the Software, and to permit persons
	27	dnl to whom the Software is furnished to do so, provided that the above
	28	dnl copyright notice(s) and this permission notice appear in all copies of
	29	dnl the Software and that both the above copyright notice(s) and this
	30	dnl permission notice appear in supporting documentation.
	31	dnl
	32	dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
	33	dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	34	dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
	35	dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
	36	dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
	37	dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
	38	dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
	39	dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
	40	dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	41	dnl
	42	dnl Except as contained in this notice, the name of a copyright holder
	43	dnl shall not be used in advertising or otherwise to promote the sale, use
	44	dnl or other dealings in this Software without prior written authorization
	45	dnl of the copyright holder.
	46
	47	# XORG_MACROS_VERSION(required-version)
	48	# -------------------------------------
	49	# Minimum version: 1.1.0
	50	#
	51	# If you're using a macro added in Version 1.1 or newer, include this in
	52	# your configure.ac with the minimum required version, such as:
	53	# XORG_MACROS_VERSION(1.1)
	54	#
	55	# To force at least a version with this macro defined, also add:
	56	# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
	57	#
	58	#
	59	# See the "minimum version" comment for each macro you use to see what
	60	# version you require.
	61	AC_DEFUN([XORG_MACROS_VERSION],[
	62	[XORG_MACROS_needed_version=$1
	63	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version \| sed 's/\..*$//'`
	64	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version \| sed -e 's/^[0-9]\.//' -e 's/\..$//'`]
	65	AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
	66	[XORG_MACROS_version=1.2.1
	67	XORG_MACROS_major=`echo $XORG_MACROS_version \| sed 's/\..*$//'`
	68	XORG_MACROS_minor=`echo $XORG_MACROS_version \| sed -e 's/^[0-9]\.//' -e 's/\..$//'`]
	69	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
	70	AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
	71	fi
	72	if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
	73	AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
	74	fi
	75	AC_MSG_RESULT([yes, $XORG_MACROS_version])
	76	]) # XORG_MACROS_VERSION
	77
	78	# XORG_PROG_RAWCPP()
	79	# ------------------
	80	# Minimum version: 1.0.0
	81	#
	82	# Find cpp program and necessary flags for use in pre-processing text files
	83	# such as man pages and config files
	84	AC_DEFUN([XORG_PROG_RAWCPP],[
	85	AC_REQUIRE([AC_PROG_CPP])
	86	AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
	87	[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
	88
	89	# Check for flag to avoid builtin definitions - assumes unix is predefined,
	90	# which is not the best choice for supporting other OS'es, but covers most
	91	# of the ones we need for now.
	92	AC_MSG_CHECKING([if $RAWCPP requires -undef])
	93	AC_LANG_CONFTEST([Does cpp redefine unix ?])
	94	if test `${RAWCPP} < conftest.$ac_ext \| grep -c 'unix'` -eq 1 ; then
	95	AC_MSG_RESULT([no])
	96	else
	97	if test `${RAWCPP} -undef < conftest.$ac_ext \| grep -c 'unix'` -eq 1 ; then
	98	RAWCPPFLAGS=-undef
	99	AC_MSG_RESULT([yes])
	100	# under Cygwin unix is still defined even with -undef
	101	elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext \| grep -c 'unix'` -eq 1 ; then
	102	RAWCPPFLAGS="-undef -ansi"
	103	AC_MSG_RESULT([yes, with -ansi])
	104	else
	105	AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
	106	fi
	107	fi
	108	rm -f conftest.$ac_ext
	109
	110	AC_MSG_CHECKING([if $RAWCPP requires -traditional])
	111	AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
	112	if test `${RAWCPP} < conftest.$ac_ext \| grep -c 'preserve \"'` -eq 1 ; then
	113	AC_MSG_RESULT([no])
	114	else
	115	if test `${RAWCPP} -traditional < conftest.$ac_ext \| grep -c 'preserve \"'` -eq 1 ; then
	116	RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
	117	AC_MSG_RESULT([yes])
	118	else
	119	AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.])
	120	fi
	121	fi
	122	rm -f conftest.$ac_ext
	123	AC_SUBST(RAWCPPFLAGS)
	124	]) # XORG_PROG_RAWCPP
	125
	126	# XORG_MANPAGE_SECTIONS()
	127	# -----------------------
	128	# Minimum version: 1.0.0
	129	#
	130	# Determine which sections man pages go in for the different man page types
	131	# on this OS - replaces ManSuffix settings in old Imake .cf per-os files.
	132	# Not sure if there's any better way than just hardcoding by OS name.
	133	# Override default settings by setting environment variables
	134
	135	AC_DEFUN([XORG_MANPAGE_SECTIONS],[
	136	AC_REQUIRE([AC_CANONICAL_HOST])
	137
	138	if test x$APP_MAN_SUFFIX = x ; then
	139	APP_MAN_SUFFIX=1
	140	fi
	141	if test x$APP_MAN_DIR = x ; then
	142	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
	143	fi
	144
	145	if test x$LIB_MAN_SUFFIX = x ; then
	146	LIB_MAN_SUFFIX=3
	147	fi
	148	if test x$LIB_MAN_DIR = x ; then
	149	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
	150	fi
	151
	152	if test x$FILE_MAN_SUFFIX = x ; then
	153	case $host_os in
	154	solaris*) FILE_MAN_SUFFIX=4 ;;
	155	*) FILE_MAN_SUFFIX=5 ;;
	156	esac
	157	fi
	158	if test x$FILE_MAN_DIR = x ; then
	159	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
	160	fi
	161
	162	if test x$MISC_MAN_SUFFIX = x ; then
	163	case $host_os in
	164	solaris*) MISC_MAN_SUFFIX=5 ;;
	165	*) MISC_MAN_SUFFIX=7 ;;
	166	esac
	167	fi
	168	if test x$MISC_MAN_DIR = x ; then
	169	MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
	170	fi
	171
	172	if test x$DRIVER_MAN_SUFFIX = x ; then
	173	case $host_os in
	174	solaris*) DRIVER_MAN_SUFFIX=7 ;;
	175	*) DRIVER_MAN_SUFFIX=4 ;;
	176	esac
	177	fi
	178	if test x$DRIVER_MAN_DIR = x ; then
	179	DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
	180	fi
	181
	182	if test x$ADMIN_MAN_SUFFIX = x ; then
	183	case $host_os in
	184	solaris*) ADMIN_MAN_SUFFIX=1m ;;
	185	*) ADMIN_MAN_SUFFIX=8 ;;
	186	esac
	187	fi
	188	if test x$ADMIN_MAN_DIR = x ; then
	189	ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
	190	fi
	191
	192
	193	AC_SUBST([APP_MAN_SUFFIX])
	194	AC_SUBST([LIB_MAN_SUFFIX])
	195	AC_SUBST([FILE_MAN_SUFFIX])
	196	AC_SUBST([MISC_MAN_SUFFIX])
	197	AC_SUBST([DRIVER_MAN_SUFFIX])
	198	AC_SUBST([ADMIN_MAN_SUFFIX])
	199	AC_SUBST([APP_MAN_DIR])
	200	AC_SUBST([LIB_MAN_DIR])
	201	AC_SUBST([FILE_MAN_DIR])
	202	AC_SUBST([MISC_MAN_DIR])
	203	AC_SUBST([DRIVER_MAN_DIR])
	204	AC_SUBST([ADMIN_MAN_DIR])
	205	]) # XORG_MANPAGE_SECTIONS
	206
	207	# XORG_CHECK_LINUXDOC
	208	# -------------------
	209	# Minimum version: 1.0.0
	210	#
	211	# Defines the variable MAKE_TEXT if the necessary tools and
	212	# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
	213	# Whether or not the necessary tools and files are found can be checked
	214	# with the AM_CONDITIONAL "BUILD_LINUXDOC"
	215	AC_DEFUN([XORG_CHECK_LINUXDOC],[
	216	if test x$XORG_SGML_PATH = x ; then
	217	XORG_SGML_PATH=$prefix/share/sgml
	218	fi
	219	HAVE_DEFS_ENT=
	220
	221	if test x"$cross_compiling" = x"yes" ; then
	222	HAVE_DEFS_ENT=no
	223	else
	224	AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
	225	fi
	226
	227	AC_PATH_PROG(LINUXDOC, linuxdoc)
	228	AC_PATH_PROG(PS2PDF, ps2pdf)
	229
	230	AC_MSG_CHECKING([Whether to build documentation])
	231
	232	if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
	233	BUILDDOC=yes
	234	else
	235	BUILDDOC=no
	236	fi
	237
	238	AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
	239
	240	AC_MSG_RESULT([$BUILDDOC])
	241
	242	AC_MSG_CHECKING([Whether to build pdf documentation])
	243
	244	if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
	245	BUILDPDFDOC=yes
	246	else
	247	BUILDPDFDOC=no
	248	fi
	249
	250	AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
	251
	252	AC_MSG_RESULT([$BUILDPDFDOC])
	253
	254	MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
	255	MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
	256	MAKE_PDF="$PS2PDF"
	257	MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
	258
	259	AC_SUBST(MAKE_TEXT)
	260	AC_SUBST(MAKE_PS)
	261	AC_SUBST(MAKE_PDF)
	262	AC_SUBST(MAKE_HTML)
	263	]) # XORG_CHECK_LINUXDOC
	264
	265	# XORG_CHECK_DOCBOOK
	266	# -------------------
	267	# Minimum version: 1.0.0
	268	#
	269	# Checks for the ability to build output formats from SGML DocBook source.
	270	# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
	271	# indicates whether the necessary tools and files are found and, if set,
	272	# $(MAKE_XXX) blah.sgml will produce blah.xxx.
	273	AC_DEFUN([XORG_CHECK_DOCBOOK],[
	274	if test x$XORG_SGML_PATH = x ; then
	275	XORG_SGML_PATH=$prefix/share/sgml
	276	fi
	277	HAVE_DEFS_ENT=
	278	BUILDTXTDOC=no
	279	BUILDPDFDOC=no
	280	BUILDPSDOC=no
	281	BUILDHTMLDOC=no
	282
	283	AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
	284
	285	AC_PATH_PROG(DOCBOOKPS, docbook2ps)
	286	AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
	287	AC_PATH_PROG(DOCBOOKHTML, docbook2html)
	288	AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
	289
	290	AC_MSG_CHECKING([Whether to build text documentation])
	291	if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
	292	test x$BUILD_TXTDOC != xno; then
	293	BUILDTXTDOC=yes
	294	fi
	295	AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
	296	AC_MSG_RESULT([$BUILDTXTDOC])
	297
	298	AC_MSG_CHECKING([Whether to build PDF documentation])
	299	if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
	300	test x$BUILD_PDFDOC != xno; then
	301	BUILDPDFDOC=yes
	302	fi
	303	AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
	304	AC_MSG_RESULT([$BUILDPDFDOC])
	305
	306	AC_MSG_CHECKING([Whether to build PostScript documentation])
	307	if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
	308	test x$BUILD_PSDOC != xno; then
	309	BUILDPSDOC=yes
	310	fi
	311	AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
	312	AC_MSG_RESULT([$BUILDPSDOC])
	313
	314	AC_MSG_CHECKING([Whether to build HTML documentation])
	315	if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
	316	test x$BUILD_HTMLDOC != xno; then
	317	BUILDHTMLDOC=yes
	318	fi
	319	AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
	320	AC_MSG_RESULT([$BUILDHTMLDOC])
	321
	322	MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
	323	MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
	324	MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
	325	MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
	326
	327	AC_SUBST(MAKE_TEXT)
	328	AC_SUBST(MAKE_PS)
	329	AC_SUBST(MAKE_PDF)
	330	AC_SUBST(MAKE_HTML)
	331	]) # XORG_CHECK_DOCBOOK
	332
	333	# XORG_CHECK_MALLOC_ZERO
	334	# ----------------------
	335	# Minimum version: 1.0.0
	336	#
	337	# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
	338	# malloc(0) returns NULL. Packages should add one of these cflags to
	339	# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
	340	AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
	341	AC_ARG_ENABLE(malloc0returnsnull,
	342	AC_HELP_STRING([--enable-malloc0returnsnull],
	343	[malloc(0) returns NULL (default: auto)]),
	344	[MALLOC_ZERO_RETURNS_NULL=$enableval],
	345	[MALLOC_ZERO_RETURNS_NULL=auto])
	346
	347	AC_MSG_CHECKING([whether malloc(0) returns NULL])
	348	if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
	349	AC_RUN_IFELSE([
	350	char *malloc();
	351	char *realloc();
	352	char *calloc();
	353	main() {
	354	char m0, r0, c0, p;
	355	m0 = malloc(0);
	356	p = malloc(10);
	357	r0 = realloc(p,0);
	358	c0 = calloc(0);
	359	exit(m0 == 0 \|\| r0 == 0 \|\| c0 == 0 ? 0 : 1);
	360	}],
	361	[MALLOC_ZERO_RETURNS_NULL=yes],
	362	[MALLOC_ZERO_RETURNS_NULL=no])
	363	fi
	364	AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
	365
	366	if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
	367	MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
	368	XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
	369	XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
	370	else
	371	MALLOC_ZERO_CFLAGS=""
	372	XMALLOC_ZERO_CFLAGS=""
	373	XTMALLOC_ZERO_CFLAGS=""
	374	fi
	375
	376	AC_SUBST([MALLOC_ZERO_CFLAGS])
	377	AC_SUBST([XMALLOC_ZERO_CFLAGS])
	378	AC_SUBST([XTMALLOC_ZERO_CFLAGS])
	379	]) # XORG_CHECK_MALLOC_ZERO
	380
	381	# XORG_WITH_LINT()
	382	# ----------------
	383	# Minimum version: 1.1.0
	384	#
	385	# Sets up flags for source checkers such as lint and sparse if --with-lint
	386	# is specified. (Use --with-lint=sparse for sparse.)
	387	# Sets $LINT to name of source checker passed with --with-lint (default: lint)
	388	# Sets $LINT_FLAGS to flags to pass to source checker
	389	# Sets LINT automake conditional if enabled (default: disabled)
	390	#
	391	AC_DEFUN([XORG_WITH_LINT],[
	392
	393	# Allow checking code with lint, sparse, etc.
	394	AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
	395	[Use a lint-style source code checker (default: disabled)])],
	396	[use_lint=$withval], [use_lint=no])
	397	if test "x$use_lint" = "xyes" ; then
	398	LINT="lint"
	399	else
	400	LINT="$use_lint"
	401	fi
	402	if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
	403	case $LINT in
	404	lint\|*/lint)
	405	case $host_os in
	406	solaris*)
	407	LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
	408	;;
	409	esac
	410	;;
	411	esac
	412	fi
	413
	414	AC_SUBST(LINT)
	415	AC_SUBST(LINT_FLAGS)
	416	AM_CONDITIONAL(LINT, [test x$LINT != xno])
	417
	418	]) # XORG_WITH_LINT
	419
	420	# XORG_LINT_LIBRARY(LIBNAME)
	421	# --------------------------
	422	# Minimum version: 1.1.0
	423	#
	424	# Sets up flags for building lint libraries for checking programs that call
	425	# functions in the library.
	426	# Disabled by default, enable with --enable-lint-library
	427	# Sets:
	428	# @LINTLIB@ - name of lint library file to make
	429	# MAKE_LINT_LIB - automake conditional
	430	#
	431
	432	AC_DEFUN([XORG_LINT_LIBRARY],[
	433	AC_REQUIRE([XORG_WITH_LINT])
	434	# Build lint "library" for more indepth checks of programs calling this library
	435	AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
	436	[Create lint library (default: disabled)])],
	437	[make_lint_lib=$enableval], [make_lint_lib=no])
	438	if test "x$make_lint_lib" != "xno" ; then
	439	if test "x$LINT" = "xno" ; then
	440	AC_MSG_ERROR([Cannot make lint library without --with-lint])
	441	fi
	442	if test "x$make_lint_lib" = "xyes" ; then
	443	LINTLIB=llib-l$1.ln
	444	else
	445	LINTLIB=$make_lint_lib
	446	fi
	447	fi
	448	AC_SUBST(LINTLIB)
	449	AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
	450
	451	]) # XORG_LINT_LIBRARY
	452
	453	# XORG_CWARNFLAGS
	454	# ---------------
	455	# Minimum version: 1.2.0
	456	#
	457	# Defines CWARNFLAGS to enable C compiler warnings.
	458	#
	459	AC_DEFUN([XORG_CWARNFLAGS], [
	460	AC_REQUIRE([AC_PROG_CC])
	461	if test "x$GCC" = xyes ; then
	462	CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
	463	-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
	464	-Wbad-function-cast"
	465	case `gcc -dumpversion` in
	466	3.4.* \| 4.*)
	467	CWARNFLAGS+=" -Wold-style-definition -Wdeclaration-after-statement"
	468	;;
	469	esac
	470	else
	471	AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
	472	if test "x$SUNCC" = "xyes"; then
	473	CWARNFLAGS="-v"
	474	fi
	475	fi
	476	AC_SUBST(CWARNFLAGS)
	477	]) # XORG_CWARNFLAGS
	478	dnl Copyright 2005 Red Hat, Inc
	479	dnl
	480	dnl Permission to use, copy, modify, distribute, and sell this software and its
	481	dnl documentation for any purpose is hereby granted without fee, provided that
	482	dnl the above copyright notice appear in all copies and that both that
	483	dnl copyright notice and this permission notice appear in supporting
	484	dnl documentation.
	485	dnl
	486	dnl The above copyright notice and this permission notice shall be included
	487	dnl in all copies or substantial portions of the Software.
	488	dnl
	489	dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
	490	dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	491	dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	492	dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
	493	dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	494	dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	495	dnl OTHER DEALINGS IN THE SOFTWARE.
	496	dnl
	497	dnl Except as contained in this notice, the name of the copyright holders shall
	498	dnl not be used in advertising or otherwise to promote the sale, use or
	499	dnl other dealings in this Software without prior written authorization
	500	dnl from the copyright holders.
	501	dnl
	502
	503	# XORG_RELEASE_VERSION
	504	# --------------------
	505	# Adds --with/without-release-string and changes the PACKAGE and
	506	# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
	507	# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
	508	# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
	509
	510	AC_DEFUN([XORG_RELEASE_VERSION],[
	511	AC_ARG_WITH(release-version,
	512	AC_HELP_STRING([--with-release-version=STRING],
	513	[Use release version string in package name]),
	514	[RELEASE_VERSION="$withval"],
	515	[RELEASE_VERSION=""])
	516	if test "x$RELEASE_VERSION" != "x"; then
	517	PACKAGE="$PACKAGE-$RELEASE_VERSION"
	518	PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
	519	AC_MSG_NOTICE([Building with package name set to $PACKAGE])
	520	fi
	521	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
	522	[`echo $PACKAGE_VERSION \| cut -d . -f 1`],
	523	[Major version of this package])
	524	PVM=`echo $PACKAGE_VERSION \| cut -d . -f 2 \| cut -d - -f 1`
	525	if test "x$PVM" = "x"; then
	526	PVM="0"
	527	fi
	528	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
	529	[$PVM],
	530	[Minor version of this package])
	531	PVP=`echo $PACKAGE_VERSION \| cut -d . -f 3 \| cut -d - -f 1`
	532	if test "x$PVP" = "x"; then
	533	PVP="0"
	534	fi
	535	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
	536	[$PVP],
	537	[Patch version of this package])
	538	])
	539
	540	# XORG_CHANGELOG()
	541	# ----------------
	542	# Minimum version: 1.2.0
	543	#
	544	# Defines the variable CHANGELOG_CMD as the command to generate
	545	# ChangeLog from git.
	546	#
	547	# Arrange that distcleancheck ignores ChangeLog left over by distclean.
	548	#
	549	AC_DEFUN([XORG_CHANGELOG], [
	550	CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
	551	mv .changelog.tmp ChangeLog) \|\| (rm -f .changelog.tmp; touch ChangeLog; \
	552	echo 'git directory not found: installing possibly empty changelog.' >&2)"
	553	AC_SUBST([CHANGELOG_CMD])
	554	AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
	555	]) # XORG_CHANGELOG
17	556
18	557	# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
19	558	#

900	1439	AC_SUBST([am__untar])
901	1440	]) # _AM_PROG_TAR
902	1441
903		dnl Copyright 2005 Red Hat, Inc
904		dnl
905		dnl Permission to use, copy, modify, distribute, and sell this software and its
906		dnl documentation for any purpose is hereby granted without fee, provided that
907		dnl the above copyright notice appear in all copies and that both that
908		dnl copyright notice and this permission notice appear in supporting
909		dnl documentation.
910		dnl
911		dnl The above copyright notice and this permission notice shall be included
912		dnl in all copies or substantial portions of the Software.
913		dnl
914		dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
915		dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
916		dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
917		dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
918		dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
919		dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
920		dnl OTHER DEALINGS IN THE SOFTWARE.
921		dnl
922		dnl Except as contained in this notice, the name of the copyright holders shall
923		dnl not be used in advertising or otherwise to promote the sale, use or
924		dnl other dealings in this Software without prior written authorization
925		dnl from the copyright holders.
926		dnl
927
928		# XAW_CHECK_XPRINT_SUPPORT()
929		# --------------------------
930		# Adds --enable/disable-xprint and selects the appropriate version of the Xaw
931		# library. If neither --enable-xprint nor --disable-xprint are given,
932		# the presence of an Xaw with Xprint support will be auto detected
933
934		AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
935		AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
936		[use_xprint=$enableval],[use_xprint=auto])
937		if test "x$use_xprint" = "xyes"; then
938		TMP_CHECK1=xaw8
939		TMP_CHECK2=
940		xaw_use_xprint=yes
941		elif test "x$use_xprint" = "xno"; then
942		TMP_CHECK1=xaw7
943		TMP_CHECK2=
944		xaw_use_xprint=no
945		else
946		TMP_CHECK1=xaw8
947		TMP_CHECK2=xaw7
948		xaw_use_xprint=yes
949		fi
950
951		PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK1, success=yes, success=no)
952		if [[ ! -z $TMP_CHECK2 ]] ; then
953		if test $success = no ; then
954		PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK2, success=yes, success=no)
955		xaw_use_xprint=no
956		fi
957		fi
958
959		if test "x$success" = "xyes"; then
960		$1_CFLAGS=$TMP_XAW_CFLAGS
961		$1_LIBS=$TMP_XAW_LIBS
962
963		AM_CONDITIONAL([XAW_USE_XPRINT], [test "x$xaw_use_xprint" = "xyes"])
964		else
965		AC_MSG_ERROR([No suitable version of Xaw found])
966		fi
967		])
968
	1442	dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
969	1443	dnl
970	1444	dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
971	1445	dnl

1002	1476	# your configure.ac with the minimum required version, such as:
1003	1477	# XORG_MACROS_VERSION(1.1)
1004	1478	#
1005		# To force at least a version with this macro defined, also add:
1006		# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
	1479	# To ensure that this macro is defined, also add:
	1480	# m4_ifndef([XORG_MACROS_VERSION],
	1481	# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
1007	1482	#
1008	1483	#
1009	1484	# See the "minimum version" comment for each macro you use to see what
1010	1485	# version you require.
1011		AC_DEFUN([XORG_MACROS_VERSION],[
1012		[XORG_MACROS_needed_version=$1
1013		XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version \| sed 's/\..*$//'`
1014		XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version \| sed -e 's/^[0-9]\.//' -e 's/\..$//'`]
1015		AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
1016		[XORG_MACROS_version=1.1.5
1017		XORG_MACROS_major=`echo $XORG_MACROS_version \| sed 's/\..*$//'`
1018		XORG_MACROS_minor=`echo $XORG_MACROS_version \| sed -e 's/^[0-9]\.//' -e 's/\..$//'`]
1019		if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
1020		AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
1021		fi
1022		if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
1023		AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
1024		fi
1025		AC_MSG_RESULT([yes, $XORG_MACROS_version])
	1486	m4_defun([XORG_MACROS_VERSION],[
	1487	m4_define([vers_have], [1.2.2])
	1488	m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
	1489	m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
	1490	m4_if(m4_cmp(maj_have, maj_needed), 0,,
	1491	[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
	1492	m4_if(m4_version_compare(vers_have, [$1]), -1,
	1493	[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
	1494	m4_undefine([vers_have])
	1495	m4_undefine([maj_have])
	1496	m4_undefine([maj_needed])
1026	1497	]) # XORG_MACROS_VERSION
1027	1498
1028	1499	# XORG_PROG_RAWCPP()

1047	1518	if test `${RAWCPP} -undef < conftest.$ac_ext \| grep -c 'unix'` -eq 1 ; then
1048	1519	RAWCPPFLAGS=-undef
1049	1520	AC_MSG_RESULT([yes])
	1521	# under Cygwin unix is still defined even with -undef
	1522	elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext \| grep -c 'unix'` -eq 1 ; then
	1523	RAWCPPFLAGS="-undef -ansi"
	1524	AC_MSG_RESULT([yes, with -ansi])
1050	1525	else
1051	1526	AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
1052	1527	fi

1159	1634	# Whether or not the necessary tools and files are found can be checked
1160	1635	# with the AM_CONDITIONAL "BUILD_LINUXDOC"
1161	1636	AC_DEFUN([XORG_CHECK_LINUXDOC],[
1162		XORG_SGML_PATH=$prefix/share/sgml
	1637	if test x$XORG_SGML_PATH = x ; then
	1638	XORG_SGML_PATH=$prefix/share/sgml
	1639	fi
1163	1640	HAVE_DEFS_ENT=
1164	1641
1165	1642	if test x"$cross_compiling" = x"yes" ; then

1215	1692	# indicates whether the necessary tools and files are found and, if set,
1216	1693	# $(MAKE_XXX) blah.sgml will produce blah.xxx.
1217	1694	AC_DEFUN([XORG_CHECK_DOCBOOK],[
1218		XORG_SGML_PATH=$prefix/share/sgml
	1695	if test x$XORG_SGML_PATH = x ; then
	1696	XORG_SGML_PATH=$prefix/share/sgml
	1697	fi
1219	1698	HAVE_DEFS_ENT=
1220	1699	BUILDTXTDOC=no
1221	1700	BUILDPDFDOC=no

1392	1871
1393	1872	]) # XORG_LINT_LIBRARY
1394	1873
	1874	# XORG_CWARNFLAGS
	1875	# ---------------
	1876	# Minimum version: 1.2.0
	1877	#
	1878	# Defines CWARNFLAGS to enable C compiler warnings.
	1879	#
	1880	AC_DEFUN([XORG_CWARNFLAGS], [
	1881	AC_REQUIRE([AC_PROG_CC])
	1882	if test "x$GCC" = xyes ; then
	1883	CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
	1884	-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
	1885	-Wbad-function-cast"
	1886	case `$CC -dumpversion` in
	1887	3.4.* \| 4.*)
	1888	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
	1889	;;
	1890	esac
	1891	else
	1892	AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
	1893	if test "x$SUNCC" = "xyes"; then
	1894	CWARNFLAGS="-v"
	1895	fi
	1896	fi
	1897	AC_SUBST(CWARNFLAGS)
	1898	]) # XORG_CWARNFLAGS
1395	1899	dnl Copyright 2005 Red Hat, Inc
1396	1900	dnl
1397	1901	dnl Permission to use, copy, modify, distribute, and sell this software and its

1438	1942	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
1439	1943	[`echo $PACKAGE_VERSION \| cut -d . -f 1`],
1440	1944	[Major version of this package])
1441		PVM=`echo $PACKAGE_VERSION \| cut -d . -f 2`
	1945	PVM=`echo $PACKAGE_VERSION \| cut -d . -f 2 \| cut -d - -f 1`
1442	1946	if test "x$PVM" = "x"; then
1443	1947	PVM="0"
1444	1948	fi
1445	1949	AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
1446	1950	[$PVM],
1447	1951	[Minor version of this package])
1448		PVP=`echo $PACKAGE_VERSION \| cut -d . -f 3`
	1952	PVP=`echo $PACKAGE_VERSION \| cut -d . -f 3 \| cut -d - -f 1`
1449	1953	if test "x$PVP" = "x"; then
1450	1954	PVP="0"
1451	1955	fi

1453	1957	[$PVP],
1454	1958	[Patch version of this package])
1455	1959	])
	1960
	1961	# XORG_CHANGELOG()
	1962	# ----------------
	1963	# Minimum version: 1.2.0
	1964	#
	1965	# Defines the variable CHANGELOG_CMD as the command to generate
	1966	# ChangeLog from git.
	1967	#
	1968	# Arrange that distcleancheck ignores ChangeLog left over by distclean.
	1969	#
	1970	AC_DEFUN([XORG_CHANGELOG], [
	1971	CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
	1972	mv .changelog.tmp ChangeLog) \|\| (rm -f .changelog.tmp; touch ChangeLog; \
	1973	echo 'git directory not found: installing possibly empty changelog.' >&2)"
	1974	AC_SUBST([CHANGELOG_CMD])
	1975	AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
	1976	]) # XORG_CHANGELOG
1456	1977
1457	1978	# pkg.m4 - Macros to locate and utilise pkg-config. -- Autoconf --
1458	1979	#

+27

-0

xmag/app-defaults/Xmag less more

	0	! $Xorg: Xmag.ad,v 1.3 2000/08/17 19:54:54 cpqbld Exp $
	1	! $XFree86$
	2	*Font: fixed
	3	pane2orientation: horizontal
	4	pane2showGrip: False
	5	*allowShellResize: on
	6	*Scale.baseTranslations:#augment\
	7	<EnterWindow>: set-colors()\n\
	8	<LeaveWindow>: unset-colors()\n\
	9	<Btn1Down>:popup-pixel()\n\
	10	Button1<Enter>:popup-pixel()\n\
	11	<Btn1Motion>:update-pixel()\n\
	12	<Btn1Up>:popdown-pixel()\n\
	13	<Leave>:popdown-pixel()\n\
	14	<Key>n:new()\n\
	15	<Key>q:close()\n\
	16	Ctrl<Key>c:close()\n\
	17	<Key>space:replace()
	18	*close.accelerators:#augment\
	19	<Key>q:set()notify()unset()\n\
	20	Ctrl<Key>c:set()notify()unset()
	21	*replace.accelerators:#augment\
	22	<Key>space:set()notify()unset()\n\
	23	<Btn2Up>:set()notify()unset()\n\
	24	<Btn3Up>:set()notify()unset()
	25	*helpLabel.font: 8x13bold
	26	*helpLabel.label: xmag

+30

-0

xmag/config.h.in less more

0	0	/* config.h.in. Generated from configure.ac by autoheader. */
	1
	2	/* Define to 1 if you have the <inttypes.h> header file. */
	3	#undef HAVE_INTTYPES_H
	4
	5	/* Define to 1 if you have the <memory.h> header file. */
	6	#undef HAVE_MEMORY_H
1	7
2	8	/* Define to 1 if you have the `nanosleep' function. */
3	9	#undef HAVE_NANOSLEEP

7	13
8	14	/* Define to 1 if you have the `select' function. */
9	15	#undef HAVE_SELECT
	16
	17	/* Define to 1 if you have the <stdint.h> header file. */
	18	#undef HAVE_STDINT_H
	19
	20	/* Define to 1 if you have the <stdlib.h> header file. */
	21	#undef HAVE_STDLIB_H
	22
	23	/* Define to 1 if you have the <strings.h> header file. */
	24	#undef HAVE_STRINGS_H
	25
	26	/* Define to 1 if you have the <string.h> header file. */
	27	#undef HAVE_STRING_H
	28
	29	/* Define to 1 if you have the <sys/stat.h> header file. */
	30	#undef HAVE_SYS_STAT_H
	31
	32	/* Define to 1 if you have the <sys/types.h> header file. */
	33	#undef HAVE_SYS_TYPES_H
	34
	35	/* Define to 1 if you have the <unistd.h> header file. */
	36	#undef HAVE_UNISTD_H
10	37
11	38	/* Name of package */
12	39	#undef PACKAGE

35	62	/* Patch version of this package */
36	63	#undef PACKAGE_VERSION_PATCHLEVEL
37	64
	65	/* Define to 1 if you have the ANSI C header files. */
	66	#undef STDC_HEADERS
	67
38	68	/* Version number of package */
39	69	#undef VERSION

+866

-149

xmag/configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.61 for xmag 1.0.2.
	2	# Generated by GNU Autoconf 2.61 for xmag 1.0.3.
3	3	#
4	4	# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
5	5	#

573	573	# Identity of this package.
574	574	PACKAGE_NAME='xmag'
575	575	PACKAGE_TARNAME='xmag'
576		PACKAGE_VERSION='1.0.2'
577		PACKAGE_STRING='xmag 1.0.2'
	576	PACKAGE_VERSION='1.0.3'
	577	PACKAGE_STRING='xmag 1.0.3'
578	578	PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
	579
	580	# Factoring default headers for most tests.
	581	ac_includes_default="\
	582	#include <stdio.h>
	583	#ifdef HAVE_SYS_TYPES_H
	584	# include <sys/types.h>
	585	#endif
	586	#ifdef HAVE_SYS_STAT_H
	587	# include <sys/stat.h>
	588	#endif
	589	#ifdef STDC_HEADERS
	590	# include <stdlib.h>
	591	# include <stddef.h>
	592	#else
	593	# ifdef HAVE_STDLIB_H
	594	# include <stdlib.h>
	595	# endif
	596	#endif
	597	#ifdef HAVE_STRING_H
	598	# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
	599	# include <memory.h>
	600	# endif
	601	# include <string.h>
	602	#endif
	603	#ifdef HAVE_STRINGS_H
	604	# include <strings.h>
	605	#endif
	606	#ifdef HAVE_INTTYPES_H
	607	# include <inttypes.h>
	608	#endif
	609	#ifdef HAVE_STDINT_H
	610	# include <stdint.h>
	611	#endif
	612	#ifdef HAVE_UNISTD_H
	613	# include <unistd.h>
	614	#endif"
579	615
580	616	ac_subst_vars='SHELL
581	617	PATH_SEPARATOR

655	691	CCDEPMODE
656	692	am__fastdepCC_TRUE
657	693	am__fastdepCC_FALSE
	694	CPP
	695	GREP
	696	EGREP
	697	CWARNFLAGS
658	698	PKG_CONFIG
659		TMP_XAW_CFLAGS
660		TMP_XAW_LIBS
661		XAW_USE_XPRINT_TRUE
662		XAW_USE_XPRINT_FALSE
663	699	XMAG_CFLAGS
664	700	XMAG_LIBS
665	701	APPDEFS_CFLAGS

685	721	MISC_MAN_DIR
686	722	DRIVER_MAN_DIR
687	723	ADMIN_MAN_DIR
	724	CHANGELOG_CMD
	725	distcleancheck_listfiles
688	726	LIBOBJS
689	727	LTLIBOBJS'
690	728	ac_subst_files=''

696	734	LDFLAGS
697	735	LIBS
698	736	CPPFLAGS
	737	CPP
699	738	PKG_CONFIG
700		TMP_XAW_CFLAGS
701		TMP_XAW_LIBS
	739	XMAG_CFLAGS
	740	XMAG_LIBS
702	741	APPDEFS_CFLAGS
703	742	APPDEFS_LIBS'
704	743

1203	1242	# Omit some internal or obsolete options to make the list less imposing.
1204	1243	# This message is too long to be a string in the A/UX 3.1 sh.
1205	1244	cat <<_ACEOF
1206		\`configure' configures xmag 1.0.2 to adapt to many kinds of systems.
	1245	\`configure' configures xmag 1.0.3 to adapt to many kinds of systems.
1207	1246
1208	1247	Usage: $0 [OPTION]... [VAR=VALUE]...
1209	1248

1273	1312
1274	1313	if test -n "$ac_init_help"; then
1275	1314	case $ac_init_help in
1276		short \| recursive ) echo "Configuration of xmag 1.0.2:";;
	1315	short \| recursive ) echo "Configuration of xmag 1.0.3:";;
1277	1316	esac
1278	1317	cat <<\_ACEOF
1279	1318

1284	1323	(and sometimes confusing) to the casual installer
1285	1324	--disable-dependency-tracking speeds up one-time build
1286	1325	--enable-dependency-tracking do not reject slow dependency extractors
1287		--enable-xprint Enable XPrint support
1288	1326
1289	1327	Optional Packages:
1290	1328	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1291	1329	--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
	1330	--with-appdefaultdir=<pathname>
	1331	specify directory for app-defaults files (default is
	1332	autodetected)
1292	1333	--with-release-version=STRING
1293	1334	Use release version string in package name
1294	1335

1300	1341	LIBS libraries to pass to the linker, e.g. -l<library>
1301	1342	CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
1302	1343	you have headers in a nonstandard directory <include dir>
	1344	CPP C preprocessor
1303	1345	PKG_CONFIG path to pkg-config utility
1304		TMP_XAW_CFLAGS
1305		C compiler flags for TMP_XAW, overriding pkg-config
1306		TMP_XAW_LIBS
1307		linker flags for TMP_XAW, overriding pkg-config
	1346	XMAG_CFLAGS C compiler flags for XMAG, overriding pkg-config
	1347	XMAG_LIBS linker flags for XMAG, overriding pkg-config
1308	1348	APPDEFS_CFLAGS
1309	1349	C compiler flags for APPDEFS, overriding pkg-config
1310	1350	APPDEFS_LIBS

1374	1414	test -n "$ac_init_help" && exit $ac_status
1375	1415	if $ac_init_version; then
1376	1416	cat <<\_ACEOF
1377		xmag configure 1.0.2
	1417	xmag configure 1.0.3
1378	1418	generated by GNU Autoconf 2.61
1379	1419
1380	1420	Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

1388	1428	This file contains any messages produced by compilers while
1389	1429	running configure, to aid debugging if configure makes a mistake.
1390	1430
1391		It was created by xmag $as_me 1.0.2, which was
	1431	It was created by xmag $as_me 1.0.3, which was
1392	1432	generated by GNU Autoconf 2.61. Invocation command line was
1393	1433
1394	1434	$ $0 $@

2078	2118
2079	2119	# Define the identity of the package.
2080	2120	PACKAGE='xmag'
2081		VERSION='1.0.2'
	2121	VERSION='1.0.3'
2082	2122
2083	2123
2084	2124	cat >>confdefs.h <<_ACEOF

2244	2284	fi
2245	2285
2246	2286	MAINT=$MAINTAINER_MODE_TRUE
	2287
	2288
	2289
	2290	# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
	2291
	2292
	2293
	2294
	2295
	2296
	2297
	2298
	2299
2247	2300
2248	2301
2249	2302

3421	3474
3422	3475
3423	3476
	3477	ac_ext=c
	3478	ac_cpp='$CPP $CPPFLAGS'
	3479	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	3480	ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	3481	ac_compiler_gnu=$ac_cv_c_compiler_gnu
	3482	{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
	3483	echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
	3484	# On Suns, sometimes $CPP names a directory.
	3485	if test -n "$CPP" && test -d "$CPP"; then
	3486	CPP=
	3487	fi
	3488	if test -z "$CPP"; then
	3489	if test "${ac_cv_prog_CPP+set}" = set; then
	3490	echo $ECHO_N "(cached) $ECHO_C" >&6
	3491	else
	3492	# Double quotes because CPP needs to be expanded
	3493	for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
	3494	do
	3495	ac_preproc_ok=false
	3496	for ac_c_preproc_warn_flag in '' yes
	3497	do
	3498	# Use a header file that comes with gcc, so configuring glibc
	3499	# with a fresh cross-compiler works.
	3500	# Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
	3501	# <limits.h> exists even on freestanding compilers.
	3502	# On the NeXT, cc -E runs the code through the compiler's parser,
	3503	# not just through cpp. "Syntax error" is here to catch this case.
	3504	cat >conftest.$ac_ext <<_ACEOF
	3505	/* confdefs.h. */
	3506	_ACEOF
	3507	cat confdefs.h >>conftest.$ac_ext
	3508	cat >>conftest.$ac_ext <<_ACEOF
	3509	/* end confdefs.h. */
	3510	#ifdef __STDC__
	3511	# include <limits.h>
	3512	#else
	3513	# include <assert.h>
	3514	#endif
	3515	Syntax error
	3516	_ACEOF
	3517	if { (ac_try="$ac_cpp conftest.$ac_ext"
	3518	case "(($ac_try" in
	3519	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	3520	*) ac_try_echo=$ac_try;;
	3521	esac
	3522	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	3523	(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
	3524	ac_status=$?
	3525	grep -v '^ *+' conftest.er1 >conftest.err
	3526	rm -f conftest.er1
	3527	cat conftest.err >&5
	3528	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	3529	(exit $ac_status); } >/dev/null && {
	3530	test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
	3531	test ! -s conftest.err
	3532	}; then
	3533	:
	3534	else
	3535	echo "$as_me: failed program was:" >&5
	3536	sed 's/^/\| /' conftest.$ac_ext >&5
	3537
	3538	# Broken: fails on valid input.
	3539	continue
	3540	fi
	3541
	3542	rm -f conftest.err conftest.$ac_ext
	3543
	3544	# OK, works on sane cases. Now check whether nonexistent headers
	3545	# can be detected and how.
	3546	cat >conftest.$ac_ext <<_ACEOF
	3547	/* confdefs.h. */
	3548	_ACEOF
	3549	cat confdefs.h >>conftest.$ac_ext
	3550	cat >>conftest.$ac_ext <<_ACEOF
	3551	/* end confdefs.h. */
	3552	#include <ac_nonexistent.h>
	3553	_ACEOF
	3554	if { (ac_try="$ac_cpp conftest.$ac_ext"
	3555	case "(($ac_try" in
	3556	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	3557	*) ac_try_echo=$ac_try;;
	3558	esac
	3559	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	3560	(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
	3561	ac_status=$?
	3562	grep -v '^ *+' conftest.er1 >conftest.err
	3563	rm -f conftest.er1
	3564	cat conftest.err >&5
	3565	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	3566	(exit $ac_status); } >/dev/null && {
	3567	test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
	3568	test ! -s conftest.err
	3569	}; then
	3570	# Broken: success on invalid input.
	3571	continue
	3572	else
	3573	echo "$as_me: failed program was:" >&5
	3574	sed 's/^/\| /' conftest.$ac_ext >&5
	3575
	3576	# Passes both tests.
	3577	ac_preproc_ok=:
	3578	break
	3579	fi
	3580
	3581	rm -f conftest.err conftest.$ac_ext
	3582
	3583	done
	3584	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
	3585	rm -f conftest.err conftest.$ac_ext
	3586	if $ac_preproc_ok; then
	3587	break
	3588	fi
	3589
	3590	done
	3591	ac_cv_prog_CPP=$CPP
	3592
	3593	fi
	3594	CPP=$ac_cv_prog_CPP
	3595	else
	3596	ac_cv_prog_CPP=$CPP
	3597	fi
	3598	{ echo "$as_me:$LINENO: result: $CPP" >&5
	3599	echo "${ECHO_T}$CPP" >&6; }
	3600	ac_preproc_ok=false
	3601	for ac_c_preproc_warn_flag in '' yes
	3602	do
	3603	# Use a header file that comes with gcc, so configuring glibc
	3604	# with a fresh cross-compiler works.
	3605	# Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
	3606	# <limits.h> exists even on freestanding compilers.
	3607	# On the NeXT, cc -E runs the code through the compiler's parser,
	3608	# not just through cpp. "Syntax error" is here to catch this case.
	3609	cat >conftest.$ac_ext <<_ACEOF
	3610	/* confdefs.h. */
	3611	_ACEOF
	3612	cat confdefs.h >>conftest.$ac_ext
	3613	cat >>conftest.$ac_ext <<_ACEOF
	3614	/* end confdefs.h. */
	3615	#ifdef __STDC__
	3616	# include <limits.h>
	3617	#else
	3618	# include <assert.h>
	3619	#endif
	3620	Syntax error
	3621	_ACEOF
	3622	if { (ac_try="$ac_cpp conftest.$ac_ext"
	3623	case "(($ac_try" in
	3624	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	3625	*) ac_try_echo=$ac_try;;
	3626	esac
	3627	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	3628	(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
	3629	ac_status=$?
	3630	grep -v '^ *+' conftest.er1 >conftest.err
	3631	rm -f conftest.er1
	3632	cat conftest.err >&5
	3633	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	3634	(exit $ac_status); } >/dev/null && {
	3635	test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
	3636	test ! -s conftest.err
	3637	}; then
	3638	:
	3639	else
	3640	echo "$as_me: failed program was:" >&5
	3641	sed 's/^/\| /' conftest.$ac_ext >&5
	3642
	3643	# Broken: fails on valid input.
	3644	continue
	3645	fi
	3646
	3647	rm -f conftest.err conftest.$ac_ext
	3648
	3649	# OK, works on sane cases. Now check whether nonexistent headers
	3650	# can be detected and how.
	3651	cat >conftest.$ac_ext <<_ACEOF
	3652	/* confdefs.h. */
	3653	_ACEOF
	3654	cat confdefs.h >>conftest.$ac_ext
	3655	cat >>conftest.$ac_ext <<_ACEOF
	3656	/* end confdefs.h. */
	3657	#include <ac_nonexistent.h>
	3658	_ACEOF
	3659	if { (ac_try="$ac_cpp conftest.$ac_ext"
	3660	case "(($ac_try" in
	3661	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	3662	*) ac_try_echo=$ac_try;;
	3663	esac
	3664	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	3665	(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
	3666	ac_status=$?
	3667	grep -v '^ *+' conftest.er1 >conftest.err
	3668	rm -f conftest.er1
	3669	cat conftest.err >&5
	3670	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	3671	(exit $ac_status); } >/dev/null && {
	3672	test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
	3673	test ! -s conftest.err
	3674	}; then
	3675	# Broken: success on invalid input.
	3676	continue
	3677	else
	3678	echo "$as_me: failed program was:" >&5
	3679	sed 's/^/\| /' conftest.$ac_ext >&5
	3680
	3681	# Passes both tests.
	3682	ac_preproc_ok=:
	3683	break
	3684	fi
	3685
	3686	rm -f conftest.err conftest.$ac_ext
	3687
	3688	done
	3689	# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
	3690	rm -f conftest.err conftest.$ac_ext
	3691	if $ac_preproc_ok; then
	3692	:
	3693	else
	3694	{ { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
	3695	See \`config.log' for more details." >&5
	3696	echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
	3697	See \`config.log' for more details." >&2;}
	3698	{ (exit 1); exit 1; }; }
	3699	fi
	3700
	3701	ac_ext=c
	3702	ac_cpp='$CPP $CPPFLAGS'
	3703	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	3704	ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	3705	ac_compiler_gnu=$ac_cv_c_compiler_gnu
	3706
	3707
	3708	{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
	3709	echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
	3710	if test "${ac_cv_path_GREP+set}" = set; then
	3711	echo $ECHO_N "(cached) $ECHO_C" >&6
	3712	else
	3713	# Extract the first word of "grep ggrep" to use in msg output
	3714	if test -z "$GREP"; then
	3715	set dummy grep ggrep; ac_prog_name=$2
	3716	if test "${ac_cv_path_GREP+set}" = set; then
	3717	echo $ECHO_N "(cached) $ECHO_C" >&6
	3718	else
	3719	ac_path_GREP_found=false
	3720	# Loop through the user's path and test for each of PROGNAME-LIST
	3721	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	3722	for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
	3723	do
	3724	IFS=$as_save_IFS
	3725	test -z "$as_dir" && as_dir=.
	3726	for ac_prog in grep ggrep; do
	3727	for ac_exec_ext in '' $ac_executable_extensions; do
	3728	ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
	3729	{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue
	3730	# Check for GNU ac_path_GREP and select it if it is found.
	3731	# Check for GNU $ac_path_GREP
	3732	case `"$ac_path_GREP" --version 2>&1` in
	3733	GNU)
	3734	ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
	3735	*)
	3736	ac_count=0
	3737	echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
	3738	while :
	3739	do
	3740	cat "conftest.in" "conftest.in" >"conftest.tmp"
	3741	mv "conftest.tmp" "conftest.in"
	3742	cp "conftest.in" "conftest.nl"
	3743	echo 'GREP' >> "conftest.nl"
	3744	"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
	3745	diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
	3746	ac_count=`expr $ac_count + 1`
	3747	if test $ac_count -gt ${ac_path_GREP_max-0}; then
	3748	# Best one so far, save it but keep looking for a better one
	3749	ac_cv_path_GREP="$ac_path_GREP"
	3750	ac_path_GREP_max=$ac_count
	3751	fi
	3752	# 10*(2^10) chars as input seems more than enough
	3753	test $ac_count -gt 10 && break
	3754	done
	3755	rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
	3756	esac
	3757
	3758
	3759	$ac_path_GREP_found && break 3
	3760	done
	3761	done
	3762
	3763	done
	3764	IFS=$as_save_IFS
	3765
	3766
	3767	fi
	3768
	3769	GREP="$ac_cv_path_GREP"
	3770	if test -z "$GREP"; then
	3771	{ { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
	3772	echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
	3773	{ (exit 1); exit 1; }; }
	3774	fi
	3775
	3776	else
	3777	ac_cv_path_GREP=$GREP
	3778	fi
	3779
	3780
	3781	fi
	3782	{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
	3783	echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
	3784	GREP="$ac_cv_path_GREP"
	3785
	3786
	3787	{ echo "$as_me:$LINENO: checking for egrep" >&5
	3788	echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
	3789	if test "${ac_cv_path_EGREP+set}" = set; then
	3790	echo $ECHO_N "(cached) $ECHO_C" >&6
	3791	else
	3792	if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1
	3793	then ac_cv_path_EGREP="$GREP -E"
	3794	else
	3795	# Extract the first word of "egrep" to use in msg output
	3796	if test -z "$EGREP"; then
	3797	set dummy egrep; ac_prog_name=$2
	3798	if test "${ac_cv_path_EGREP+set}" = set; then
	3799	echo $ECHO_N "(cached) $ECHO_C" >&6
	3800	else
	3801	ac_path_EGREP_found=false
	3802	# Loop through the user's path and test for each of PROGNAME-LIST
	3803	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	3804	for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
	3805	do
	3806	IFS=$as_save_IFS
	3807	test -z "$as_dir" && as_dir=.
	3808	for ac_prog in egrep; do
	3809	for ac_exec_ext in '' $ac_executable_extensions; do
	3810	ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
	3811	{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue
	3812	# Check for GNU ac_path_EGREP and select it if it is found.
	3813	# Check for GNU $ac_path_EGREP
	3814	case `"$ac_path_EGREP" --version 2>&1` in
	3815	GNU)
	3816	ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
	3817	*)
	3818	ac_count=0
	3819	echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
	3820	while :
	3821	do
	3822	cat "conftest.in" "conftest.in" >"conftest.tmp"
	3823	mv "conftest.tmp" "conftest.in"
	3824	cp "conftest.in" "conftest.nl"
	3825	echo 'EGREP' >> "conftest.nl"
	3826	"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
	3827	diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
	3828	ac_count=`expr $ac_count + 1`
	3829	if test $ac_count -gt ${ac_path_EGREP_max-0}; then
	3830	# Best one so far, save it but keep looking for a better one
	3831	ac_cv_path_EGREP="$ac_path_EGREP"
	3832	ac_path_EGREP_max=$ac_count
	3833	fi
	3834	# 10*(2^10) chars as input seems more than enough
	3835	test $ac_count -gt 10 && break
	3836	done
	3837	rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
	3838	esac
	3839
	3840
	3841	$ac_path_EGREP_found && break 3
	3842	done
	3843	done
	3844
	3845	done
	3846	IFS=$as_save_IFS
	3847
	3848
	3849	fi
	3850
	3851	EGREP="$ac_cv_path_EGREP"
	3852	if test -z "$EGREP"; then
	3853	{ { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
	3854	echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
	3855	{ (exit 1); exit 1; }; }
	3856	fi
	3857
	3858	else
	3859	ac_cv_path_EGREP=$EGREP
	3860	fi
	3861
	3862
	3863	fi
	3864	fi
	3865	{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
	3866	echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
	3867	EGREP="$ac_cv_path_EGREP"
	3868
	3869
	3870	{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
	3871	echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
	3872	if test "${ac_cv_header_stdc+set}" = set; then
	3873	echo $ECHO_N "(cached) $ECHO_C" >&6
	3874	else
	3875	cat >conftest.$ac_ext <<_ACEOF
	3876	/* confdefs.h. */
	3877	_ACEOF
	3878	cat confdefs.h >>conftest.$ac_ext
	3879	cat >>conftest.$ac_ext <<_ACEOF
	3880	/* end confdefs.h. */
	3881	#include <stdlib.h>
	3882	#include <stdarg.h>
	3883	#include <string.h>
	3884	#include <float.h>
	3885
	3886	int
	3887	main ()
	3888	{
	3889
	3890	;
	3891	return 0;
	3892	}
	3893	_ACEOF
	3894	rm -f conftest.$ac_objext
	3895	if { (ac_try="$ac_compile"
	3896	case "(($ac_try" in
	3897	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	3898	*) ac_try_echo=$ac_try;;
	3899	esac
	3900	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	3901	(eval "$ac_compile") 2>conftest.er1
	3902	ac_status=$?
	3903	grep -v '^ *+' conftest.er1 >conftest.err
	3904	rm -f conftest.er1
	3905	cat conftest.err >&5
	3906	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	3907	(exit $ac_status); } && {
	3908	test -z "$ac_c_werror_flag" \|\|
	3909	test ! -s conftest.err
	3910	} && test -s conftest.$ac_objext; then
	3911	ac_cv_header_stdc=yes
	3912	else
	3913	echo "$as_me: failed program was:" >&5
	3914	sed 's/^/\| /' conftest.$ac_ext >&5
	3915
	3916	ac_cv_header_stdc=no
	3917	fi
	3918
	3919	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	3920
	3921	if test $ac_cv_header_stdc = yes; then
	3922	# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
	3923	cat >conftest.$ac_ext <<_ACEOF
	3924	/* confdefs.h. */
	3925	_ACEOF
	3926	cat confdefs.h >>conftest.$ac_ext
	3927	cat >>conftest.$ac_ext <<_ACEOF
	3928	/* end confdefs.h. */
	3929	#include <string.h>
	3930
	3931	_ACEOF
	3932	if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	3933	$EGREP "memchr" >/dev/null 2>&1; then
	3934	:
	3935	else
	3936	ac_cv_header_stdc=no
	3937	fi
	3938	rm -f conftest*
	3939
	3940	fi
	3941
	3942	if test $ac_cv_header_stdc = yes; then
	3943	# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
	3944	cat >conftest.$ac_ext <<_ACEOF
	3945	/* confdefs.h. */
	3946	_ACEOF
	3947	cat confdefs.h >>conftest.$ac_ext
	3948	cat >>conftest.$ac_ext <<_ACEOF
	3949	/* end confdefs.h. */
	3950	#include <stdlib.h>
	3951
	3952	_ACEOF
	3953	if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	3954	$EGREP "free" >/dev/null 2>&1; then
	3955	:
	3956	else
	3957	ac_cv_header_stdc=no
	3958	fi
	3959	rm -f conftest*
	3960
	3961	fi
	3962
	3963	if test $ac_cv_header_stdc = yes; then
	3964	# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
	3965	if test "$cross_compiling" = yes; then
	3966	:
	3967	else
	3968	cat >conftest.$ac_ext <<_ACEOF
	3969	/* confdefs.h. */
	3970	_ACEOF
	3971	cat confdefs.h >>conftest.$ac_ext
	3972	cat >>conftest.$ac_ext <<_ACEOF
	3973	/* end confdefs.h. */
	3974	#include <ctype.h>
	3975	#include <stdlib.h>
	3976	#if ((' ' & 0x0FF) == 0x020)
	3977	# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
	3978	# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
	3979	#else
	3980	# define ISLOWER(c) \
	3981	(('a' <= (c) && (c) <= 'i') \
	3982	\|\| ('j' <= (c) && (c) <= 'r') \
	3983	\|\| ('s' <= (c) && (c) <= 'z'))
	3984	# define TOUPPER(c) (ISLOWER(c) ? ((c) \| 0x40) : (c))
	3985	#endif
	3986
	3987	#define XOR(e, f) (((e) && !(f)) \|\| (!(e) && (f)))
	3988	int
	3989	main ()
	3990	{
	3991	int i;
	3992	for (i = 0; i < 256; i++)
	3993	if (XOR (islower (i), ISLOWER (i))
	3994	\|\| toupper (i) != TOUPPER (i))
	3995	return 2;
	3996	return 0;
	3997	}
	3998	_ACEOF
	3999	rm -f conftest$ac_exeext
	4000	if { (ac_try="$ac_link"
	4001	case "(($ac_try" in
	4002	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	4003	*) ac_try_echo=$ac_try;;
	4004	esac
	4005	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	4006	(eval "$ac_link") 2>&5
	4007	ac_status=$?
	4008	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	4009	(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
	4010	{ (case "(($ac_try" in
	4011	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	4012	*) ac_try_echo=$ac_try;;
	4013	esac
	4014	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	4015	(eval "$ac_try") 2>&5
	4016	ac_status=$?
	4017	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	4018	(exit $ac_status); }; }; then
	4019	:
	4020	else
	4021	echo "$as_me: program exited with status $ac_status" >&5
	4022	echo "$as_me: failed program was:" >&5
	4023	sed 's/^/\| /' conftest.$ac_ext >&5
	4024
	4025	( exit $ac_status )
	4026	ac_cv_header_stdc=no
	4027	fi
	4028	rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
	4029	fi
	4030
	4031
	4032	fi
	4033	fi
	4034	{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
	4035	echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
	4036	if test $ac_cv_header_stdc = yes; then
	4037
	4038	cat >>confdefs.h <<\_ACEOF
	4039	#define STDC_HEADERS 1
	4040	_ACEOF
	4041
	4042	fi
	4043
	4044	# On IRIX 5.3, sys/types and inttypes.h are conflicting.
	4045
	4046
	4047
	4048
	4049
	4050
	4051
	4052
	4053
	4054	for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
	4055	inttypes.h stdint.h unistd.h
	4056	do
	4057	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	4058	{ echo "$as_me:$LINENO: checking for $ac_header" >&5
	4059	echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
	4060	if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
	4061	echo $ECHO_N "(cached) $ECHO_C" >&6
	4062	else
	4063	cat >conftest.$ac_ext <<_ACEOF
	4064	/* confdefs.h. */
	4065	_ACEOF
	4066	cat confdefs.h >>conftest.$ac_ext
	4067	cat >>conftest.$ac_ext <<_ACEOF
	4068	/* end confdefs.h. */
	4069	$ac_includes_default
	4070
	4071	#include <$ac_header>
	4072	_ACEOF
	4073	rm -f conftest.$ac_objext
	4074	if { (ac_try="$ac_compile"
	4075	case "(($ac_try" in
	4076	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	4077	*) ac_try_echo=$ac_try;;
	4078	esac
	4079	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	4080	(eval "$ac_compile") 2>conftest.er1
	4081	ac_status=$?
	4082	grep -v '^ *+' conftest.er1 >conftest.err
	4083	rm -f conftest.er1
	4084	cat conftest.err >&5
	4085	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	4086	(exit $ac_status); } && {
	4087	test -z "$ac_c_werror_flag" \|\|
	4088	test ! -s conftest.err
	4089	} && test -s conftest.$ac_objext; then
	4090	eval "$as_ac_Header=yes"
	4091	else
	4092	echo "$as_me: failed program was:" >&5
	4093	sed 's/^/\| /' conftest.$ac_ext >&5
	4094
	4095	eval "$as_ac_Header=no"
	4096	fi
	4097
	4098	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	4099	fi
	4100	ac_res=`eval echo '${'$as_ac_Header'}'`
	4101	{ echo "$as_me:$LINENO: result: $ac_res" >&5
	4102	echo "${ECHO_T}$ac_res" >&6; }
	4103	if test `eval echo '${'$as_ac_Header'}'` = yes; then
	4104	cat >>confdefs.h <<_ACEOF
	4105	#define `echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	4106	_ACEOF
	4107
	4108	fi
	4109
	4110	done
	4111
	4112
	4113
	4114
	4115	if test "x$GCC" = xyes ; then
	4116	CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
	4117	-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
	4118	-Wbad-function-cast"
	4119	case `$CC -dumpversion` in
	4120	3.4.* \| 4.*)
	4121	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
	4122	;;
	4123	esac
	4124	else
	4125	{ echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
	4126	echo $ECHO_N "checking whether __SUNPRO_C is declared... $ECHO_C" >&6; }
	4127	if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
	4128	echo $ECHO_N "(cached) $ECHO_C" >&6
	4129	else
	4130	cat >conftest.$ac_ext <<_ACEOF
	4131	/* confdefs.h. */
	4132	_ACEOF
	4133	cat confdefs.h >>conftest.$ac_ext
	4134	cat >>conftest.$ac_ext <<_ACEOF
	4135	/* end confdefs.h. */
	4136	$ac_includes_default
	4137	int
	4138	main ()
	4139	{
	4140	#ifndef __SUNPRO_C
	4141	(void) __SUNPRO_C;
	4142	#endif
	4143
	4144	;
	4145	return 0;
	4146	}
	4147	_ACEOF
	4148	rm -f conftest.$ac_objext
	4149	if { (ac_try="$ac_compile"
	4150	case "(($ac_try" in
	4151	\" \| \` \| \\) ac_try_echo=\$ac_try;;
	4152	*) ac_try_echo=$ac_try;;
	4153	esac
	4154	eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
	4155	(eval "$ac_compile") 2>conftest.er1
	4156	ac_status=$?
	4157	grep -v '^ *+' conftest.er1 >conftest.err
	4158	rm -f conftest.er1
	4159	cat conftest.err >&5
	4160	echo "$as_me:$LINENO: \$? = $ac_status" >&5
	4161	(exit $ac_status); } && {
	4162	test -z "$ac_c_werror_flag" \|\|
	4163	test ! -s conftest.err
	4164	} && test -s conftest.$ac_objext; then
	4165	ac_cv_have_decl___SUNPRO_C=yes
	4166	else
	4167	echo "$as_me: failed program was:" >&5
	4168	sed 's/^/\| /' conftest.$ac_ext >&5
	4169
	4170	ac_cv_have_decl___SUNPRO_C=no
	4171	fi
	4172
	4173	rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	4174	fi
	4175	{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
	4176	echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_C" >&6; }
	4177	if test $ac_cv_have_decl___SUNPRO_C = yes; then
	4178	SUNCC="yes"
	4179	else
	4180	SUNCC="no"
	4181	fi
	4182
	4183	if test "x$SUNCC" = "xyes"; then
	4184	CWARNFLAGS="-v"
	4185	fi
	4186	fi
	4187
	4188
	4189
3424	4190
3425	4191
3426	4192

3640	4406
3641	4407	fi
3642	4408
3643		# Check whether --enable-xprint was given.
3644		if test "${enable_xprint+set}" = set; then
3645		enableval=$enable_xprint; use_xprint=$enableval
3646		else
3647		use_xprint=auto
3648		fi
3649
3650		if test "x$use_xprint" = "xyes"; then
3651		TMP_CHECK1=xaw8
3652		TMP_CHECK2=
3653		xaw_use_xprint=yes
3654		elif test "x$use_xprint" = "xno"; then
3655		TMP_CHECK1=xaw7
3656		TMP_CHECK2=
3657		xaw_use_xprint=no
3658		else
3659		TMP_CHECK1=xaw8
3660		TMP_CHECK2=xaw7
3661		xaw_use_xprint=yes
3662		fi
3663
3664
3665	4409	pkg_failed=no
3666		{ echo "$as_me:$LINENO: checking for TMP_XAW" >&5
3667		echo $ECHO_N "checking for TMP_XAW... $ECHO_C" >&6; }
	4410	{ echo "$as_me:$LINENO: checking for XMAG" >&5
	4411	echo $ECHO_N "checking for XMAG... $ECHO_C" >&6; }
3668	4412
3669	4413	if test -n "$PKG_CONFIG"; then
3670	4414	if test -n "$PKG_CONFIG" && \
3671		{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$TMP_CHECK1\"") >&5
3672		($PKG_CONFIG --exists --print-errors "$TMP_CHECK1") 2>&5
	4415	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7\"") >&5
	4416	($PKG_CONFIG --exists --print-errors "xaw7") 2>&5
3673	4417	ac_status=$?
3674	4418	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3675	4419	(exit $ac_status); }; then
3676		pkg_cv_TMP_XAW_CFLAGS=`$PKG_CONFIG --cflags "$TMP_CHECK1" 2>/dev/null`
	4420	pkg_cv_XMAG_CFLAGS=`$PKG_CONFIG --cflags "xaw7" 2>/dev/null`
3677	4421	else
3678	4422	pkg_failed=yes
3679	4423	fi

3682	4426	fi
3683	4427	if test -n "$PKG_CONFIG"; then
3684	4428	if test -n "$PKG_CONFIG" && \
3685		{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$TMP_CHECK1\"") >&5
3686		($PKG_CONFIG --exists --print-errors "$TMP_CHECK1") 2>&5
	4429	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7\"") >&5
	4430	($PKG_CONFIG --exists --print-errors "xaw7") 2>&5
3687	4431	ac_status=$?
3688	4432	echo "$as_me:$LINENO: \$? = $ac_status" >&5
3689	4433	(exit $ac_status); }; then
3690		pkg_cv_TMP_XAW_LIBS=`$PKG_CONFIG --libs "$TMP_CHECK1" 2>/dev/null`
	4434	pkg_cv_XMAG_LIBS=`$PKG_CONFIG --libs "xaw7" 2>/dev/null`
3691	4435	else
3692	4436	pkg_failed=yes
3693	4437	fi

3696	4440	fi
3697	4441
3698	4442	if test $pkg_failed = yes; then
3699		TMP_XAW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$TMP_CHECK1"`
	4443	XMAG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7"`
3700	4444	# Put the nasty error message in config.log where it belongs
3701		echo "$TMP_XAW_PKG_ERRORS" 1>&5
3702
3703		success=no
	4445	echo "$XMAG_PKG_ERRORS" 1>&5
	4446
	4447	{ { echo "$as_me:$LINENO: error: Package requirements (xaw7) were not met.
	4448	Consider adjusting the PKG_CONFIG_PATH environment variable if you
	4449	installed software in a non-standard prefix.
	4450
	4451	Alternatively you may set the XMAG_CFLAGS and XMAG_LIBS environment variables
	4452	to avoid the need to call pkg-config. See the pkg-config man page for
	4453	more details." >&5
	4454	echo "$as_me: error: Package requirements (xaw7) were not met.
	4455	Consider adjusting the PKG_CONFIG_PATH environment variable if you
	4456	installed software in a non-standard prefix.
	4457
	4458	Alternatively you may set the XMAG_CFLAGS and XMAG_LIBS environment variables
	4459	to avoid the need to call pkg-config. See the pkg-config man page for
	4460	more details." >&2;}
	4461	{ (exit 1); exit 1; }; }
3704	4462	elif test $pkg_failed = untried; then
3705		success=no
3706		else
3707		TMP_XAW_CFLAGS=$pkg_cv_TMP_XAW_CFLAGS
3708		TMP_XAW_LIBS=$pkg_cv_TMP_XAW_LIBS
	4463	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
	4464	is in your PATH or set the PKG_CONFIG environment variable to the full
	4465	path to pkg-config.
	4466
	4467	Alternatively you may set the XMAG_CFLAGS and XMAG_LIBS environment variables
	4468	to avoid the need to call pkg-config. See the pkg-config man page for
	4469	more details.
	4470
	4471	To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
	4472	See \`config.log' for more details." >&5
	4473	echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
	4474	is in your PATH or set the PKG_CONFIG environment variable to the full
	4475	path to pkg-config.
	4476
	4477	Alternatively you may set the XMAG_CFLAGS and XMAG_LIBS environment variables
	4478	to avoid the need to call pkg-config. See the pkg-config man page for
	4479	more details.
	4480
	4481	To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
	4482	See \`config.log' for more details." >&2;}
	4483	{ (exit 1); exit 1; }; }
	4484	else
	4485	XMAG_CFLAGS=$pkg_cv_XMAG_CFLAGS
	4486	XMAG_LIBS=$pkg_cv_XMAG_LIBS
3709	4487	{ echo "$as_me:$LINENO: result: yes" >&5
3710	4488	echo "${ECHO_T}yes" >&6; }
3711		success=yes
3712		fi
3713		if [ ! -z $TMP_CHECK2 ] ; then
3714		if test $success = no ; then
3715
3716		pkg_failed=no
3717		{ echo "$as_me:$LINENO: checking for TMP_XAW" >&5
3718		echo $ECHO_N "checking for TMP_XAW... $ECHO_C" >&6; }
3719
3720		if test -n "$PKG_CONFIG"; then
3721		if test -n "$PKG_CONFIG" && \
3722		{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$TMP_CHECK2\"") >&5
3723		($PKG_CONFIG --exists --print-errors "$TMP_CHECK2") 2>&5
3724		ac_status=$?
3725		echo "$as_me:$LINENO: \$? = $ac_status" >&5
3726		(exit $ac_status); }; then
3727		pkg_cv_TMP_XAW_CFLAGS=`$PKG_CONFIG --cflags "$TMP_CHECK2" 2>/dev/null`
3728		else
3729		pkg_failed=yes
3730		fi
3731		else
3732		pkg_failed=untried
3733		fi
3734		if test -n "$PKG_CONFIG"; then
3735		if test -n "$PKG_CONFIG" && \
3736		{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$TMP_CHECK2\"") >&5
3737		($PKG_CONFIG --exists --print-errors "$TMP_CHECK2") 2>&5
3738		ac_status=$?
3739		echo "$as_me:$LINENO: \$? = $ac_status" >&5
3740		(exit $ac_status); }; then
3741		pkg_cv_TMP_XAW_LIBS=`$PKG_CONFIG --libs "$TMP_CHECK2" 2>/dev/null`
3742		else
3743		pkg_failed=yes
3744		fi
3745		else
3746		pkg_failed=untried
3747		fi
3748
3749		if test $pkg_failed = yes; then
3750		TMP_XAW_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$TMP_CHECK2"`
3751		# Put the nasty error message in config.log where it belongs
3752		echo "$TMP_XAW_PKG_ERRORS" 1>&5
3753
3754		success=no
3755		elif test $pkg_failed = untried; then
3756		success=no
3757		else
3758		TMP_XAW_CFLAGS=$pkg_cv_TMP_XAW_CFLAGS
3759		TMP_XAW_LIBS=$pkg_cv_TMP_XAW_LIBS
3760		{ echo "$as_me:$LINENO: result: yes" >&5
3761		echo "${ECHO_T}yes" >&6; }
3762		success=yes
3763		fi
3764		xaw_use_xprint=no
3765		fi
3766		fi
3767
3768		if test "x$success" = "xyes"; then
3769		XMAG_CFLAGS=$TMP_XAW_CFLAGS
3770		XMAG_LIBS=$TMP_XAW_LIBS
3771
3772		if test "x$xaw_use_xprint" = "xyes"; then
3773		XAW_USE_XPRINT_TRUE=
3774		XAW_USE_XPRINT_FALSE='#'
3775		else
3776		XAW_USE_XPRINT_TRUE='#'
3777		XAW_USE_XPRINT_FALSE=
3778		fi
3779
3780		else
3781		{ { echo "$as_me:$LINENO: error: No suitable version of Xaw found" >&5
3782		echo "$as_me: error: No suitable version of Xaw found" >&2;}
3783		{ (exit 1); exit 1; }; }
3784		fi
3785
	4489	:
	4490	fi
	4491	XMAG_CFLAGS="$CWARNFLAGS $XMAG_CFLAGS"
3786	4492
3787	4493
3788	4494

3869	4575	echo "${ECHO_T}yes" >&6; }
3870	4576	:
3871	4577	fi
3872		appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
	4578	xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
	4579
	4580	# Check whether --with-appdefaultdir was given.
	4581	if test "${with_appdefaultdir+set}" = set; then
	4582	withval=$with_appdefaultdir; appdefaultdir="$withval"
	4583	else
	4584	appdefaultdir="${xt_appdefaultdir}"
	4585	fi
	4586
3873	4587
3874	4588
3875	4589	# Make sure we can run config.sub.

4046	4760	#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION \| cut -d . -f 1`
4047	4761	_ACEOF
4048	4762
4049		PVM=`echo $PACKAGE_VERSION \| cut -d . -f 2`
	4763	PVM=`echo $PACKAGE_VERSION \| cut -d . -f 2 \| cut -d - -f 1`
4050	4764	if test "x$PVM" = "x"; then
4051	4765	PVM="0"
4052	4766	fi

4055	4769	#define PACKAGE_VERSION_MINOR $PVM
4056	4770	_ACEOF
4057	4771
4058		PVP=`echo $PACKAGE_VERSION \| cut -d . -f 3`
	4772	PVP=`echo $PACKAGE_VERSION \| cut -d . -f 3 \| cut -d - -f 1`
4059	4773	if test "x$PVP" = "x"; then
4060	4774	PVP="0"
4061	4775	fi

4063	4777	cat >>confdefs.h <<_ACEOF
4064	4778	#define PACKAGE_VERSION_PATCHLEVEL $PVP
4065	4779	_ACEOF
	4780
	4781
	4782
	4783	CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
	4784	mv .changelog.tmp ChangeLog) \|\| (rm -f .changelog.tmp; touch ChangeLog; \
	4785	echo 'git directory not found: installing possibly empty changelog.' >&2)"
	4786
	4787	distcleancheck_listfiles='find . -type f ! -name ChangeLog -print'
4066	4788
4067	4789
4068	4790

4185	4907	Usually this means the macro was only invoked conditionally." >&2;}
4186	4908	{ (exit 1); exit 1; }; }
4187	4909	fi
4188		if test -z "${XAW_USE_XPRINT_TRUE}" && test -z "${XAW_USE_XPRINT_FALSE}"; then
4189		{ { echo "$as_me:$LINENO: error: conditional \"XAW_USE_XPRINT\" was never defined.
4190		Usually this means the macro was only invoked conditionally." >&5
4191		echo "$as_me: error: conditional \"XAW_USE_XPRINT\" was never defined.
4192		Usually this means the macro was only invoked conditionally." >&2;}
4193		{ (exit 1); exit 1; }; }
4194		fi
4195	4910
4196	4911	: ${CONFIG_STATUS=./config.status}
4197	4912	ac_clean_files_save=$ac_clean_files

4492	5207	# report actual input values of CONFIG_FILES etc. instead of their
4493	5208	# values after options handling.
4494	5209	ac_log="
4495		This file was extended by xmag $as_me 1.0.2, which was
	5210	This file was extended by xmag $as_me 1.0.3, which was
4496	5211	generated by GNU Autoconf 2.61. Invocation command line was
4497	5212
4498	5213	CONFIG_FILES = $CONFIG_FILES

4545	5260	_ACEOF
4546	5261	cat >>$CONFIG_STATUS <<_ACEOF
4547	5262	ac_cs_version="\\
4548		xmag config.status 1.0.2
	5263	xmag config.status 1.0.3
4549	5264	configured by $0, generated by GNU Autoconf 2.61,
4550	5265	with options \\"`echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4551	5266

4802	5517	CCDEPMODE!$CCDEPMODE$ac_delim
4803	5518	am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
4804	5519	am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
	5520	CPP!$CPP$ac_delim
	5521	GREP!$GREP$ac_delim
	5522	EGREP!$EGREP$ac_delim
	5523	CWARNFLAGS!$CWARNFLAGS$ac_delim
4805	5524	PKG_CONFIG!$PKG_CONFIG$ac_delim
4806		TMP_XAW_CFLAGS!$TMP_XAW_CFLAGS$ac_delim
4807		TMP_XAW_LIBS!$TMP_XAW_LIBS$ac_delim
4808		XAW_USE_XPRINT_TRUE!$XAW_USE_XPRINT_TRUE$ac_delim
4809		XAW_USE_XPRINT_FALSE!$XAW_USE_XPRINT_FALSE$ac_delim
4810	5525	XMAG_CFLAGS!$XMAG_CFLAGS$ac_delim
4811	5526	XMAG_LIBS!$XMAG_LIBS$ac_delim
4812	5527	APPDEFS_CFLAGS!$APPDEFS_CFLAGS$ac_delim

4873	5588	MISC_MAN_DIR!$MISC_MAN_DIR$ac_delim
4874	5589	DRIVER_MAN_DIR!$DRIVER_MAN_DIR$ac_delim
4875	5590	ADMIN_MAN_DIR!$ADMIN_MAN_DIR$ac_delim
	5591	CHANGELOG_CMD!$CHANGELOG_CMD$ac_delim
	5592	distcleancheck_listfiles!$distcleancheck_listfiles$ac_delim
4876	5593	LIBOBJS!$LIBOBJS$ac_delim
4877	5594	LTLIBOBJS!$LTLIBOBJS$ac_delim
4878	5595	_ACEOF
4879	5596
4880		if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed \| grep -c X` = 13; then
	5597	if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed \| grep -c X` = 15; then
4881	5598	break
4882	5599	elif $ac_last_try; then
4883	5600	{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

+15

-3

xmag/configure.ac less more

21	21	dnl Process this file with autoconf to create configure.
22	22
23	23	AC_PREREQ([2.57])
24		AC_INIT(xmag,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmag)
	24	AC_INIT(xmag, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmag)
25	25	AM_INIT_AUTOMAKE([dist-bzip2])
26	26	AM_MAINTAINER_MODE
	27
	28	# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
	29	m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
	30	XORG_MACROS_VERSION(1.2)
27	31
28	32	AM_CONFIG_HEADER(config.h)
29	33
30	34	AC_PROG_CC
31	35	AC_PROG_INSTALL
32	36
	37	XORG_CWARNFLAGS
	38
33	39	AC_CHECK_FUNCS([nanosleep poll select])
34	40
35	41	# Checks for pkg-config packages
36		XAW_CHECK_XPRINT_SUPPORT(XMAG)
	42	PKG_CHECK_MODULES(XMAG, xaw7)
	43	XMAG_CFLAGS="$CWARNFLAGS $XMAG_CFLAGS"
37	44	AC_SUBST(XMAG_CFLAGS)
38	45	AC_SUBST(XMAG_LIBS)
39	46
40	47	PKG_CHECK_MODULES(APPDEFS, xt)
41		appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
	48	xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
	49	AC_ARG_WITH(appdefaultdir,
	50	AC_HELP_STRING([--with-appdefaultdir=<pathname>],
	51	[specify directory for app-defaults files (default is autodetected)]),
	52	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
42	53	AC_SUBST(appdefaultdir)
43	54
44	55	XORG_MANPAGE_SECTIONS
45	56	XORG_RELEASE_VERSION
	57	XORG_CHANGELOG
46	58
47	59	AC_OUTPUT([Makefile])

+73

-37

xmag/xmag.c less more

49	49
50	50	#ifndef min
51	51	#define min(a, b) ((a) < (b) ? (a) : (b))
	52	#endif
	53
	54	#ifndef max
	55	#define max(a, b) ((a) > (b) ? (a) : (b))
52	56	#endif
53	57
54	58

334	338	XtSetArg(wargs[n], XtNx, label_x); n++;
335	339	XtSetArg(wargs[n], XtNy, label_y); n++;
336	340	XtSetValues(data->pixShell, wargs, n);
337
338		UpdatePixelAP(w, event, 0, 0);
	341
	342	UpdatePixelAP(w, event, NULL, NULL);
339	343	}
340	344
341	345

762	766	GetImageAndAttributes(Window w, int x, int y, int width, int height,
763	767	hlPtr data)
764	768	{
765		/* get parameters of window being magnified */
766		XGetWindowAttributes(dpy, w, &data->win_info);
767
768		if (data->win_info.depth == DefaultDepth(dpy, scr)) {
769		/* avoid off screen pixels */
770		if (x < 0) x = 0; if (y < 0) y = 0;
771		if (x + width > DisplayWidth(dpy,scr)) x = DisplayWidth(dpy,scr) - width;
772		if (y + height > DisplayHeight(dpy,scr))
773		y = DisplayHeight(dpy,scr) - height;
774		data->x = x; data->y = y;
775		/* get image pixels */
776		data->image = XGetImage (dpy,
777		RootWindow(dpy, scr),
778		x, y,
779		width, height,
780		AllPlanes, ZPixmap);
781		}
782		else {
783		int xInWin, yInWin; Window childWin;
784		XTranslateCoordinates(dpy, DefaultRootWindow(dpy), w, x, y,
785		&xInWin, &yInWin, &childWin);
786		/* avoid off screen pixels */
787		if (x + data->win_info.x < 0) x = abs(data->win_info.x);
788		if (y + data->win_info.y < 0) y = abs(data->win_info.y);
789		if (x + width > DisplayWidth(dpy,scr)) x = DisplayWidth(dpy,scr) - width;
790		if (y + height > DisplayHeight(dpy,scr))
791		y = DisplayHeight(dpy,scr) - height;
792		data->x = x; data->y = y;
793		data->image = XGetImage (dpy,
794		w,
795		xInWin, yInWin,
796		width, height,
797		AllPlanes, ZPixmap);
798
799		}
	769	/* get parameters of window being magnified */
	770	XGetWindowAttributes(dpy, w, &data->win_info);
	771
	772	if (data->win_info.depth == DefaultDepth(dpy, scr)) {
	773	/* avoid off screen pixels */
	774	if (x < 0)
	775	x = 0;
	776	if (y < 0)
	777	y = 0;
	778	if (x + width > DisplayWidth(dpy,scr))
	779	x = DisplayWidth(dpy,scr) - width;
	780	if (y + height > DisplayHeight(dpy,scr))
	781	y = DisplayHeight(dpy,scr) - height;
	782	data->x = x; data->y = y;
	783	/* get image pixels */
	784	data->image = XGetImage (dpy,
	785	RootWindow(dpy, scr),
	786	x, y,
	787	width, height,
	788	AllPlanes, ZPixmap);
	789	}
	790	else {
	791	int t0, t1;
	792	int x0, x1, y0, y1;
	793	int xInWin, yInWin;
	794	Window childWin;
	795
	796	XTranslateCoordinates(dpy, DefaultRootWindow(dpy), w, x, y,
	797	&xInWin, &yInWin, &childWin);
	798
	799	/* Avoid off screen pixels. Assume this routine is not
	800	* called for totally offscreen windows. */
	801	x0 = max(x, 0);
	802	y0 = max(y, 0);
	803	x1 = min(DisplayWidth(dpy, scr),
	804	min(x0 + width, x0 + (data->win_info.width - xInWin)));
	805	y1 = min(DisplayHeight(dpy, scr),
	806	min(y0 + height, y0 + (data->win_info.height - yInWin)));
	807
	808	/* Try to use up to width x height pixels */
	809	if (x1 - x0 < width) {
	810	t0 = x0;
	811	t1 = max(0, x - xInWin + data->win_info.width -
	812	DisplayWidth(dpy, scr));
	813	x0 = max(0, x1 - min(width, data->win_info.width - t1));
	814	xInWin -= t0 - x0;
	815	}
	816	if (y1 - y0 < height) {
	817	t0 = y0;
	818	t1 = max(0, y - yInWin + data->win_info.height -
	819	DisplayHeight(dpy, scr));
	820	y0 = max(0, y1 - min(height, data->win_info.height - t1));
	821	yInWin -= t0 - y0;
	822	}
	823
	824	data->x = x0;
	825	data->y = y0;
	826	data->width = x1 - x0;
	827	data->height = y1 - y0;
	828
	829	data->image = XGetImage (dpy,
	830	w,
	831	xInWin, yInWin,
	832	data->width, data->height,
	833	AllPlanes, ZPixmap);
	834
	835	}
800	836	}
801	837
802	838