summaryrefslogtreecommitdiff
path: root/app/rgb
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2008-06-13 04:55:04 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2008-06-13 04:55:04 +0000
commitea8f5173293e90283dd94542f6e8e5391bf9ea47 (patch)
tree52a1509e1a98999cb66003c6312c7e8a33cd3e44 /app/rgb
parentb53b4967e0112e46ea9b7ef5805fd789f31a7526 (diff)
Update to rgb 1.0.3
Diffstat (limited to 'app/rgb')
-rw-r--r--app/rgb/COPYING27
-rw-r--r--app/rgb/ChangeLog287
-rw-r--r--app/rgb/Makefile.am42
-rw-r--r--app/rgb/Makefile.in92
-rw-r--r--app/rgb/aclocal.m412
-rw-r--r--app/rgb/config.h.in33
-rw-r--r--app/rgb/configure1414
-rw-r--r--app/rgb/configure.ac32
-rw-r--r--app/rgb/rgb.c26
-rw-r--r--app/rgb/rgb.txt1
-rw-r--r--app/rgb/showrgb.c20
-rw-r--r--app/rgb/showrgb.man13
12 files changed, 1676 insertions, 323 deletions
diff --git a/app/rgb/COPYING b/app/rgb/COPYING
index ffaa287aa..27a1bc017 100644
--- a/app/rgb/COPYING
+++ b/app/rgb/COPYING
@@ -21,3 +21,30 @@ Except as contained in this notice, the name of The Open Group shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
+
+Copyright 1994, 2008 Sun Microsystems, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
diff --git a/app/rgb/ChangeLog b/app/rgb/ChangeLog
index c9bad6f6c..ebbddda05 100644
--- a/app/rgb/ChangeLog
+++ b/app/rgb/ChangeLog
@@ -1,53 +1,276 @@
-2006-05-15 Adam Jackson <ajax@freedesktop.org>
+commit f0c7399100f25d2c512ee7c922cf13a4bd9c507e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jun 5 20:17:09 2008 -0700
- * configure.ac:
- Bump to 1.0.1
+ rgb version 1.0.3
+
+ Don't you hate it when you push out a new version and then realize minutes
+ later than you've got a manpage in your distro that's not in upstream you
+ could have included?
-2006-04-28 Jeremy C. Reed <reed@reedmedia.net>
+commit 2e8b928b2176a67a0d533748f385078ad8829cc3
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jun 5 20:13:35 2008 -0700
- reviewed by: Adam Jackson
+ Include rgb(1) man page from Solaris
- * configure.ac:
- pkg-config check for xproto instead of x11.
+commit bd94a52404b0e23a61e6ca330b759fdd82a59996
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jun 5 18:25:47 2008 -0700
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ rgb version 1.0.2
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 7bb6478c651dcb576e2a0ff756365f52d9db04e4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 4 20:24:05 2008 -0700
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update showrgb man page to better match current implementation
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 749182c37cb455939ba327e9420dd652c0ff58a1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 4 20:16:12 2008 -0700
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Nuke CVS version tags
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit 11193caceaa02f639d1e8a701ed92947e7eaad36
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 4 20:09:01 2008 -0700
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Fix build to work with --with-rgb-db-type=dbm
- * configure.ac:
- Change the default rgb dir to be the same path as the X server.
+commit 0351f14a999264c152d7c585fc91ad4901e3c776
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 4 19:40:44 2008 -0700
-2005-11-23 Alan Coopersmith <alan.coopersmith@sun.com>
+ Fix build to work with --with-rgb-db-type=ndbm
+
+ Also remove #includes of unused headers & convert K&R to ANSI C
- * configure.ac:
- Fix --with-rgb-dir help string to give the right flag name.
+commit 7a327431337875e81094aaed0002c89041a0f570
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:37:05 2007 -0500
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Replace static ChangeLog with dist-hook to generate from git log
- * Makefile.am:
- * configure.ac:
- Update dependencies to work with separate build roots.
+commit 42c6e9a89d45c897c82f7ec1973f66aa1190d241
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:51:08 2007 -0400
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Add *~ to .gitignore to skip patch/emacs droppings
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 654ea29b1abed12d88e5a38abbf538779c679922
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:24:33 2007 -0400
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Rename .cvsignore to .gitignore
- * configure.ac:
- Update package version number for RC1 release.
+commit d96f362956d9e58cbb46740f825d5bad50f0fbf1
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri May 19 18:30:39 2006 +0000
+ Bump to 1.0.1
+
+commit 808ad54d56095cc09138e2d25580009daed47c8f
+Author: Jeremy C. Reed <reed@reedmedia.net>
+Date: Fri Apr 28 17:13:37 2006 +0000
+
+ pkg-config check for xproto instead of x11.
+
+commit 4a9b01708d7d0ea08534e0699311a41e8b55a9d7
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:03 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit a5dfa8230f98bf7f21046f9217cee5461587e620
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:18 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 159ab1fbe0dbb05699cc847862f135a216cfa8a0
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:17 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit f1226de089929e89ed0e77535ae129373935f4b5
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 01:40:06 2005 +0000
+
+ Change the default rgb dir to be the same path as the X server.
+
+commit 93b6b4cda7a0a2323a10405bb8b7af0e4a1a6110
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:38 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 7b13cbbdbd82403fff16fbbde0c0150f051ebdfa
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Nov 24 00:25:59 2005 +0000
+
+ Fix --with-rgb-dir help string to give the right flag name.
+
+commit 191f46bdd6a7ed44e22d5a8a095939697649e669
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:34:57 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 46f1e5df56048a5d93aca3cb800e78dbba084846
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:49 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit f9fe12f84b6f774b696cc3075ec22b9605fdbb65
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:35 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit 3a2f377dbbea0b5aca6986f90e92b54ddc106dfb
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:09:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 93b884959f2a9ef4c893ffa3d26ecef13c1ca4e8
+Author: Kean Johnson <kean@armory.com>
+Date: Tue Nov 8 06:33:31 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit cb599821a3c8dd2136b3d207911c74c2e5ad571c
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:49 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit e6ddb673f5835bf7b9804fa29e62edd20419ea47
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:20 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 15bccd547d6038edb9cbc4f9ad02dfbed6f9dcb8
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:42 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 9ee0a8cb83cfcf475441e393bfa04ea4fcbf49f9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 22:35:37 2005 +0000
+
+ Change default install dir for rgb.txt from libdir to libdir/X11, since
+ that's where Xorg looks for it
+
+commit fbb5f013d40c7a0ea26ac33a5abce1e9dd0ccadc
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 20:25:28 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 321c5f16ba1851a96a12bc5bafa832c3b9ac08e9
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:30 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 1dda7081659c8d5eacbfed77ee0aa594b17440a0
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Jul 28 15:57:12 2005 +0000
+
+ Fix distcheck for remaining apps
+
+commit 794993251c8700061f84246f87ec3c060f2ffb37
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 27 19:40:28 2005 +0000
+
+ Check for xproto
+
+commit 4531a95fde3e9e0dac1e24c0e140094d24503ce2
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Jul 23 15:32:50 2005 +0000
+
+ Don't link in -lucb on Solaris
+ #ifdef HAVE_CONFIG_H/#include "config.h" for modularization
+
+commit d468fba83ec0d963f70ac0f6be47c41ce4080803
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Jul 21 04:21:06 2005 +0000
+
+ oops, forgot to cvs add autogen.sh
+
+commit ab0ad07c8529ee5d5da88de28956f81b9ecf833c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Jul 21 04:20:35 2005 +0000
+
+ Initial autotooling of rgb/showrgb (Defaults to flat text file - dbm/ndbm
+ support partially implemented, but not yet buildable since it requires
+ site.h & rgb.h from Xserver/includes)
+
+commit 7a676fdf168ed250baef3b99393f3dccbda91a7e
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jun 29 18:20:16 2005 +0000
+
+ Add build system for rgb symlink.sh: Link pmconfig.cpp, link various text
+ files for rgb xc/programs/rgb/showrgb.c: Don't include rgb.h and site.h
+ when USE_RGB_TXT is defined
+
+commit ad45da26f8f399bad12c6af78cc211f1dc563e58
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:36 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit a1edb12b592188781e4a18898fb1cd3fab472e4f
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:34:55 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 2c7849cf40d3f24e14a9668110a93e35a9120cd9
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:53 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 3798295f9b9e66543233d7fd44e95a244f0f8b06
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:15 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 3bfe5e286e3ca975e1a0e12bbb527f73bbf443aa
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:57 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit da58b20fd4fd40bccb34ce2e8f1401fc994c973c
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 1f2079d6943e2c85edbeeb4309f7ec5e216ee640
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:53 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/app/rgb/Makefile.am b/app/rgb/Makefile.am
index 9a9250d1f..c1a08920f 100644
--- a/app/rgb/Makefile.am
+++ b/app/rgb/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -27,24 +27,28 @@
#
-if RGB_TXT
bin_PROGRAMS = showrgb
-else
-bin_PROGRAMS = rgb showrgb
-rgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
+showrgb_SOURCES = showrgb.c
+
+appman_PRE = showrgb.man
+
+if RGB_DB
+bin_PROGRAMS += rgb
+
rgb_SOURCES = rgb.c
+
+appman_PRE += rgb.man
+
+$(RGB_DB_FILES): rgb rgb.txt
+ -rm -f $(RGB_DB_FILES)
+ ./rgb rgb < $(srcdir)/rgb.txt
endif
rgbdir = $(db_dir)
rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
-
-showrgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
-showrgb_SOURCES = showrgb.c
-
-appman_PRE = \
- showrgb.man
+AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
EXTRA_DIST= \
rgb.txt \
@@ -58,7 +62,7 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
-CLEANFILES = $(appman_DATA)
+CLEANFILES = $(appman_DATA) $(RGB_DB_FILES)
SED = sed
@@ -67,6 +71,10 @@ XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
+ -e 's|__RGB_DB__|$(db_dir)/$(db_file)|' \
+ -e 's|__RGB_DB_DIR__|$(db_dir)|' \
+ -e 's|__RGB_DB_TYPE__|$(RGB_DB_TYPE)|' \
+ -e 's|__RGB_DB_FILES__|$(RGB_DB_FILES)|' \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
@@ -83,3 +91,13 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (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)
+
+dist-hook: ChangeLog
diff --git a/app/rgb/Makefile.in b/app/rgb/Makefile.in
index b7a8cb726..aef43ba60 100644
--- a/app/rgb/Makefile.in
+++ b/app/rgb/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -65,8 +65,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@RGB_TXT_FALSE@bin_PROGRAMS = rgb$(EXEEXT) showrgb$(EXEEXT)
-@RGB_TXT_TRUE@bin_PROGRAMS = showrgb$(EXEEXT)
+bin_PROGRAMS = showrgb$(EXEEXT) $(am__EXEEXT_1)
+@RGB_DB_TRUE@am__append_1 = rgb
+@RGB_DB_TRUE@am__append_2 = rgb.man
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
@@ -81,15 +82,16 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
+@RGB_DB_TRUE@am__EXEEXT_1 = rgb$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
"$(DESTDIR)$(rgbdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am__rgb_SOURCES_DIST = rgb.c
-@RGB_TXT_FALSE@am_rgb_OBJECTS = rgb-rgb.$(OBJEXT)
+@RGB_DB_TRUE@am_rgb_OBJECTS = rgb.$(OBJEXT)
rgb_OBJECTS = $(am_rgb_OBJECTS)
rgb_LDADD = $(LDADD)
-am_showrgb_OBJECTS = showrgb-showrgb.$(OBJEXT)
+am_showrgb_OBJECTS = showrgb.$(OBJEXT)
showrgb_OBJECTS = $(am_showrgb_OBJECTS)
showrgb_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@@ -138,6 +140,7 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -147,6 +150,7 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+EGREP = @EGREP@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
@@ -176,14 +180,17 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RGB_CFLAGS = @RGB_CFLAGS@
+RGB_DB_FALSE = @RGB_DB_FALSE@
RGB_DB_FILES = @RGB_DB_FILES@
+RGB_DB_TRUE = @RGB_DB_TRUE@
+RGB_DB_TYPE = @RGB_DB_TYPE@
RGB_LIBS = @RGB_LIBS@
-RGB_TXT_FALSE = @RGB_TXT_FALSE@
-RGB_TXT_TRUE = @RGB_TXT_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_LIBS = @XORG_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -224,27 +231,28 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-@RGB_TXT_FALSE@rgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
-@RGB_TXT_FALSE@rgb_SOURCES = rgb.c
+showrgb_SOURCES = showrgb.c
+appman_PRE = showrgb.man $(am__append_2)
+@RGB_DB_TRUE@rgb_SOURCES = rgb.c
rgbdir = $(db_dir)
rgb_DATA = $(db_file).txt $(RGB_DB_FILES)
RGB_DB_DEFINES = -DRGB_DB=\"$(db_dir)/$(db_file)\"
-showrgb_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
-showrgb_SOURCES = showrgb.c
-appman_PRE = \
- showrgb.man
-
+AM_CFLAGS = $(RGB_CFLAGS) $(RGB_DB_DEFINES)
EXTRA_DIST = rgb.txt others/README others/old-rgb.txt \
- others/raveling.txt others/thomas.txt $(appman_PRE)
+ others/raveling.txt others/thomas.txt $(appman_PRE) ChangeLog
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-CLEANFILES = $(appman_DATA)
+CLEANFILES = $(appman_DATA) $(RGB_DB_FILES)
SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MAN_SUBSTS = \
+ -e 's|__RGB_DB__|$(db_dir)/$(db_file)|' \
+ -e 's|__RGB_DB_DIR__|$(db_dir)|' \
+ -e 's|__RGB_DB_TYPE__|$(RGB_DB_TYPE)|' \
+ -e 's|__RGB_DB_FILES__|$(RGB_DB_FILES)|' \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
@@ -258,6 +266,7 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -349,8 +358,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb-rgb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showrgb-showrgb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showrgb.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -365,34 +374,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-rgb-rgb.o: rgb.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -MT rgb-rgb.o -MD -MP -MF "$(DEPDIR)/rgb-rgb.Tpo" -c -o rgb-rgb.o `test -f 'rgb.c' || echo '$(srcdir)/'`rgb.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/rgb-rgb.Tpo" "$(DEPDIR)/rgb-rgb.Po"; else rm -f "$(DEPDIR)/rgb-rgb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rgb.c' object='rgb-rgb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -c -o rgb-rgb.o `test -f 'rgb.c' || echo '$(srcdir)/'`rgb.c
-
-rgb-rgb.obj: rgb.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -MT rgb-rgb.obj -MD -MP -MF "$(DEPDIR)/rgb-rgb.Tpo" -c -o rgb-rgb.obj `if test -f 'rgb.c'; then $(CYGPATH_W) 'rgb.c'; else $(CYGPATH_W) '$(srcdir)/rgb.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/rgb-rgb.Tpo" "$(DEPDIR)/rgb-rgb.Po"; else rm -f "$(DEPDIR)/rgb-rgb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rgb.c' object='rgb-rgb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rgb_CFLAGS) $(CFLAGS) -c -o rgb-rgb.obj `if test -f 'rgb.c'; then $(CYGPATH_W) 'rgb.c'; else $(CYGPATH_W) '$(srcdir)/rgb.c'; fi`
-
-showrgb-showrgb.o: showrgb.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -MT showrgb-showrgb.o -MD -MP -MF "$(DEPDIR)/showrgb-showrgb.Tpo" -c -o showrgb-showrgb.o `test -f 'showrgb.c' || echo '$(srcdir)/'`showrgb.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/showrgb-showrgb.Tpo" "$(DEPDIR)/showrgb-showrgb.Po"; else rm -f "$(DEPDIR)/showrgb-showrgb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showrgb.c' object='showrgb-showrgb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -c -o showrgb-showrgb.o `test -f 'showrgb.c' || echo '$(srcdir)/'`showrgb.c
-
-showrgb-showrgb.obj: showrgb.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -MT showrgb-showrgb.obj -MD -MP -MF "$(DEPDIR)/showrgb-showrgb.Tpo" -c -o showrgb-showrgb.obj `if test -f 'showrgb.c'; then $(CYGPATH_W) 'showrgb.c'; else $(CYGPATH_W) '$(srcdir)/showrgb.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/showrgb-showrgb.Tpo" "$(DEPDIR)/showrgb-showrgb.Po"; else rm -f "$(DEPDIR)/showrgb-showrgb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showrgb.c' object='showrgb-showrgb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(showrgb_CFLAGS) $(CFLAGS) -c -o showrgb-showrgb.obj `if test -f 'showrgb.c'; then $(CYGPATH_W) 'showrgb.c'; else $(CYGPATH_W) '$(srcdir)/showrgb.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@@ -507,6 +488,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -636,6 +620,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -691,8 +676,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appmanDATA install-binPROGRAMS install-data \
@@ -705,8 +690,19 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
uninstall-info-am uninstall-rgbDATA
+@RGB_DB_TRUE@$(RGB_DB_FILES): rgb rgb.txt
+@RGB_DB_TRUE@ -rm -f $(RGB_DB_FILES)
+@RGB_DB_TRUE@ ./rgb rgb < $(srcdir)/rgb.txt
+
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (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)
+
+dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/app/rgb/aclocal.m4 b/app/rgb/aclocal.m4
index 5419cfb3c..48f9f8de2 100644
--- a/app/rgb/aclocal.m4
+++ b/app/rgb/aclocal.m4
@@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.5
+ [XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
HAVE_DEFS_ENT=
-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+if test x"$cross_compiling" = x"yes" ; then
+ HAVE_DEFS_ENT=no
+else
+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
diff --git a/app/rgb/config.h.in b/app/rgb/config.h.in
index e69c424db..600090e8d 100644
--- a/app/rgb/config.h.in
+++ b/app/rgb/config.h.in
@@ -1,5 +1,35 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Header file to include for dbm functions */
+#undef DBM_HEADER
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
/* Define to 1 if you have ndbm.h interfaces */
#undef NDBM
@@ -30,6 +60,9 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Define to 1 to use plain text files for rgb database */
#undef USE_RGB_TXT
diff --git a/app/rgb/configure b/app/rgb/configure
index 894d14c5d..06e7a3f70 100644
--- a/app/rgb/configure
+++ b/app/rgb/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for rgb 1.0.1.
+# Generated by GNU Autoconf 2.59 for rgb 1.0.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -269,11 +269,48 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='rgb'
PACKAGE_TARNAME='rgb'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='rgb 1.0.1'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='rgb 1.0.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE db_file db_dir RGB_DB_FILES RGB_TXT_TRUE RGB_TXT_FALSE PKG_CONFIG ac_pt_PKG_CONFIG RGB_CFLAGS RGB_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG RGB_CFLAGS RGB_LIBS db_file db_dir CPP EGREP XORG_CFLAGS XORG_LIBS RGB_DB_TYPE RGB_DB_FILES RGB_DB_TRUE RGB_DB_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -742,6 +779,18 @@ ac_env_RGB_LIBS_set=${RGB_LIBS+set}
ac_env_RGB_LIBS_value=$RGB_LIBS
ac_cv_env_RGB_LIBS_set=${RGB_LIBS+set}
ac_cv_env_RGB_LIBS_value=$RGB_LIBS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_XORG_CFLAGS_set=${XORG_CFLAGS+set}
+ac_env_XORG_CFLAGS_value=$XORG_CFLAGS
+ac_cv_env_XORG_CFLAGS_set=${XORG_CFLAGS+set}
+ac_cv_env_XORG_CFLAGS_value=$XORG_CFLAGS
+ac_env_XORG_LIBS_set=${XORG_LIBS+set}
+ac_env_XORG_LIBS_value=$XORG_LIBS
+ac_cv_env_XORG_LIBS_set=${XORG_LIBS+set}
+ac_cv_env_XORG_LIBS_value=$XORG_LIBS
#
# Report the --help message.
@@ -750,7 +799,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures rgb 1.0.1 to adapt to many kinds of systems.
+\`configure' configures rgb 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -816,7 +865,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rgb 1.0.1:";;
+ short | recursive ) echo "Configuration of rgb 1.0.3:";;
esac
cat <<\_ACEOF
@@ -849,6 +898,9 @@ Some influential environment variables:
PKG_CONFIG path to pkg-config utility
RGB_CFLAGS C compiler flags for RGB, overriding pkg-config
RGB_LIBS linker flags for RGB, overriding pkg-config
+ CPP C preprocessor
+ XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
+ XORG_LIBS linker flags for XORG, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -949,7 +1001,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-rgb configure 1.0.1
+rgb configure 1.0.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -963,7 +1015,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rgb $as_me 1.0.1, which was
+It was created by rgb $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1561,7 +1613,7 @@ fi
# Define the identity of the package.
PACKAGE='rgb'
- VERSION='1.0.1'
+ VERSION='1.0.3'
cat >>confdefs.h <<_ACEOF
@@ -2903,6 +2955,223 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ PKG_CONFIG=""
+ fi
+
+fi
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for RGB" >&5
+echo $ECHO_N "checking for RGB... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$RGB_CFLAGS"; then
+ pkg_cv_RGB_CFLAGS="$RGB_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_RGB_CFLAGS=`$PKG_CONFIG --cflags "xproto" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$RGB_LIBS"; then
+ pkg_cv_RGB_LIBS="$RGB_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_RGB_LIBS=`$PKG_CONFIG --libs "xproto" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ RGB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
+ else
+ RGB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$RGB_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (xproto) were not met:
+
+$RGB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables RGB_CFLAGS
+and RGB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (xproto) were not met:
+
+$RGB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables RGB_CFLAGS
+and RGB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables RGB_CFLAGS
+and RGB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables RGB_CFLAGS
+and RGB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ RGB_CFLAGS=$pkg_cv_RGB_CFLAGS
+ RGB_LIBS=$pkg_cv_RGB_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ :
+fi
+
echo "$as_me:$LINENO: checking for rgb database location" >&5
echo $ECHO_N "checking for rgb database location... $ECHO_C" >&6
@@ -2933,6 +3202,8 @@ fi;
echo "$as_me:$LINENO: result: $db_type" >&5
echo "${ECHO_T}$db_type" >&6
+RGB_DB_TYPE=$db_type
+
case $db_type in
text)
RGB_DB_FILES=""
@@ -3004,7 +3275,7 @@ fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_dbminit" = no; then
- for ac_lib in db dbm; do
+ for ac_lib in db dbm nsl; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3074,7 +3345,896 @@ echo "$as_me: error: dbm requested but dbminit() not found in any libraries" >&2
{ (exit 1); exit 1; }; }
fi
- RGB_DB_FILES="$(db_file).dir $(db_file).pag"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+ then ac_cv_prog_egrep='grep -E'
+ else ac_cv_prog_egrep='egrep'
+ fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_header_stdc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ exit(2);
+ exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+if test "${ac_cv_header_dbm_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for dbm.h" >&5
+echo $ECHO_N "checking for dbm.h... $ECHO_C" >&6
+if test "${ac_cv_header_dbm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_dbm_h" >&5
+echo "${ECHO_T}$ac_cv_header_dbm_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking dbm.h usability" >&5
+echo $ECHO_N "checking dbm.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <dbm.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking dbm.h presence" >&5
+echo $ECHO_N "checking dbm.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dbm.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: dbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: dbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dbm.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: dbm.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: dbm.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: dbm.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dbm.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: dbm.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dbm.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: dbm.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dbm.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: dbm.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dbm.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: dbm.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dbm.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: dbm.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for dbm.h" >&5
+echo $ECHO_N "checking for dbm.h... $ECHO_C" >&6
+if test "${ac_cv_header_dbm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_dbm_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_dbm_h" >&5
+echo "${ECHO_T}$ac_cv_header_dbm_h" >&6
+
+fi
+if test $ac_cv_header_dbm_h = yes; then
+ DBM_HEADER='<dbm.h>'
+else
+ if test "${ac_cv_header_rpcsvc_dbm_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for rpcsvc/dbm.h" >&5
+echo $ECHO_N "checking for rpcsvc/dbm.h... $ECHO_C" >&6
+if test "${ac_cv_header_rpcsvc_dbm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_rpcsvc_dbm_h" >&5
+echo "${ECHO_T}$ac_cv_header_rpcsvc_dbm_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking rpcsvc/dbm.h usability" >&5
+echo $ECHO_N "checking rpcsvc/dbm.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <rpcsvc/dbm.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking rpcsvc/dbm.h presence" >&5
+echo $ECHO_N "checking rpcsvc/dbm.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <rpcsvc/dbm.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: rpcsvc/dbm.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: rpcsvc/dbm.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for rpcsvc/dbm.h" >&5
+echo $ECHO_N "checking for rpcsvc/dbm.h... $ECHO_C" >&6
+if test "${ac_cv_header_rpcsvc_dbm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_rpcsvc_dbm_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_rpcsvc_dbm_h" >&5
+echo "${ECHO_T}$ac_cv_header_rpcsvc_dbm_h" >&6
+
+fi
+if test $ac_cv_header_rpcsvc_dbm_h = yes; then
+ DBM_HEADER='<rpcsvc/dbm.h>'
+else
+ { { echo "$as_me:$LINENO: error: dbm requested but dbm.h not found" >&5
+echo "$as_me: error: dbm requested but dbm.h not found" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+fi
+
+
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for XORG" >&5
+echo $ECHO_N "checking for XORG... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XORG_CFLAGS"; then
+ pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XORG_LIBS"; then
+ pkg_cv_XORG_LIBS="$XORG_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server"`
+ else
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XORG_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (xorg-server) were not met:
+
+$XORG_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (xorg-server) were not met:
+
+$XORG_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
+ XORG_LIBS=$pkg_cv_XORG_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ :
+fi
+ RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
+ RGB_DB_FILES='$(db_file).dir $(db_file).pag'
;;
ndbm)
# Find a dbm or ndbm implementation
@@ -3212,142 +4372,23 @@ echo "$as_me: error: ndbm requested but dbm_open() not found in any libraries" >
{ (exit 1); exit 1; }; }
fi
- RGB_DB_FILES="$(db_file).dir $(db_file).pag"
- ;;
-esac
-
-
-
-if test x$db_type = xtext; then
- RGB_TXT_TRUE=
- RGB_TXT_FALSE='#'
-else
- RGB_TXT_TRUE='#'
- RGB_TXT_FALSE=
-fi
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
-if test -n "$ac_pt_PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- PKG_CONFIG=$ac_pt_PKG_CONFIG
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- PKG_CONFIG=""
- fi
-
-fi
+ DBM_HEADER='<ndbm.h>'
pkg_failed=no
-echo "$as_me:$LINENO: checking for RGB" >&5
-echo $ECHO_N "checking for RGB... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for XORG" >&5
+echo $ECHO_N "checking for XORG... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
- if test -n "$RGB_CFLAGS"; then
- pkg_cv_RGB_CFLAGS="$RGB_CFLAGS"
+ if test -n "$XORG_CFLAGS"; then
+ pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
- ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_RGB_CFLAGS=`$PKG_CONFIG --cflags "xproto" 2>/dev/null`
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -3356,16 +4397,16 @@ else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
- if test -n "$RGB_LIBS"; then
- pkg_cv_RGB_LIBS="$RGB_LIBS"
+ if test -n "$XORG_LIBS"; then
+ pkg_cv_XORG_LIBS="$XORG_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
- ($PKG_CONFIG --exists --print-errors "xproto") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_RGB_LIBS=`$PKG_CONFIG --libs "xproto" 2>/dev/null`
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -3384,33 +4425,33 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- RGB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server"`
else
- RGB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$RGB_PKG_ERRORS" >&5
+ echo "$XORG_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (xproto) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (xorg-server) were not met:
-$RGB_PKG_ERRORS
+$XORG_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables RGB_CFLAGS
-and RGB_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements (xproto) were not met:
+echo "$as_me: error: Package requirements (xorg-server) were not met:
-$RGB_PKG_ERRORS
+$XORG_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables RGB_CFLAGS
-and RGB_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&2;}
{ (exit 1); exit 1; }; }
@@ -3419,8 +4460,8 @@ elif test $pkg_failed = untried; then
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables RGB_CFLAGS
-and RGB_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -3429,20 +4470,44 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables RGB_CFLAGS
-and RGB_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
- RGB_CFLAGS=$pkg_cv_RGB_CFLAGS
- RGB_LIBS=$pkg_cv_RGB_LIBS
+ XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
+ XORG_LIBS=$pkg_cv_XORG_LIBS
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
:
fi
+ RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
+ RGB_DB_FILES='$(db_file).dir $(db_file).pag'
+ ;;
+esac
+if test x$DBM_HEADER != x ; then
+
+cat >>confdefs.h <<_ACEOF
+#define DBM_HEADER $DBM_HEADER
+_ACEOF
+
+fi
+
+
+
+
+if test x$db_type != xtext; then
+ RGB_DB_TRUE=
+ RGB_DB_FALSE='#'
+else
+ RGB_DB_TRUE='#'
+ RGB_DB_FALSE=
+fi
+
+
# Make sure we can run config.sub.
@@ -3590,7 +4655,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
_ACEOF
- PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
@@ -3599,7 +4664,7 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION_MINOR $PVM
_ACEOF
- PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@@ -3723,10 +4788,10 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${RGB_TXT_TRUE}" && test -z "${RGB_TXT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"RGB_TXT\" was never defined.
+if test -z "${RGB_DB_TRUE}" && test -z "${RGB_DB_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"RGB_DB\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"RGB_TXT\" was never defined.
+echo "$as_me: error: conditional \"RGB_DB\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4001,7 +5066,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by rgb $as_me 1.0.1, which was
+This file was extended by rgb $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +5129,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-rgb config.status 1.0.1
+rgb config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -4303,15 +5368,20 @@ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@db_file@,$db_file,;t t
-s,@db_dir@,$db_dir,;t t
-s,@RGB_DB_FILES@,$RGB_DB_FILES,;t t
-s,@RGB_TXT_TRUE@,$RGB_TXT_TRUE,;t t
-s,@RGB_TXT_FALSE@,$RGB_TXT_FALSE,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@RGB_CFLAGS@,$RGB_CFLAGS,;t t
s,@RGB_LIBS@,$RGB_LIBS,;t t
+s,@db_file@,$db_file,;t t
+s,@db_dir@,$db_dir,;t t
+s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
+s,@XORG_CFLAGS@,$XORG_CFLAGS,;t t
+s,@XORG_LIBS@,$XORG_LIBS,;t t
+s,@RGB_DB_TYPE@,$RGB_DB_TYPE,;t t
+s,@RGB_DB_FILES@,$RGB_DB_FILES,;t t
+s,@RGB_DB_TRUE@,$RGB_DB_TRUE,;t t
+s,@RGB_DB_FALSE@,$RGB_DB_FALSE,;t t
s,@build@,$build,;t t
s,@build_cpu@,$build_cpu,;t t
s,@build_vendor@,$build_vendor,;t t
diff --git a/app/rgb/configure.ac b/app/rgb/configure.ac
index 6c3e6dff9..69cc6a76a 100644
--- a/app/rgb/configure.ac
+++ b/app/rgb/configure.ac
@@ -28,7 +28,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(rgb,[1.0.1],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
+AC_INIT(rgb,[1.0.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],rgb)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -37,6 +37,8 @@ AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
+PKG_CHECK_MODULES(RGB, xproto)
+
AC_MSG_CHECKING([for rgb database location])
AC_ARG_WITH([rgb-db-dir],
AC_HELP_STRING([--with-rgb-db-dir=<path>],
@@ -56,6 +58,8 @@ AC_ARG_WITH([rgb-db-type],
[db_type=$withval], [db_type="text"])
AC_MSG_RESULT([$db_type])
+RGB_DB_TYPE=$db_type
+
case $db_type in
text)
RGB_DB_FILES=""
@@ -63,23 +67,35 @@ case $db_type in
[Define to 1 to use plain text files for rgb database])
;;
dbm)
- AC_SEARCH_LIBS([dbminit], [db dbm], [],
+ AC_SEARCH_LIBS([dbminit], [db dbm nsl], [],
AC_MSG_ERROR([dbm requested but dbminit() not found in any libraries]))
- RGB_DB_FILES="$(db_file).dir $(db_file).pag"
+ AC_CHECK_HEADER([dbm.h], [DBM_HEADER='<dbm.h>'],
+ [AC_CHECK_HEADER([rpcsvc/dbm.h], [DBM_HEADER='<rpcsvc/dbm.h>'],
+ [AC_MSG_ERROR([dbm requested but dbm.h not found])])])
+ PKG_CHECK_MODULES(XORG, [xorg-server])
+ RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
+ RGB_DB_FILES='$(db_file).dir $(db_file).pag'
;;
ndbm)
# Find a dbm or ndbm implementation
- AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],
- AC_DEFINE([NDBM], [1],
+ AC_SEARCH_LIBS([dbm_open], [db ndbm dbm],
+ AC_DEFINE([NDBM], [1],
[Define to 1 if you have ndbm.h interfaces]),
AC_MSG_ERROR([ndbm requested but dbm_open() not found in any libraries]))
- RGB_DB_FILES="$(db_file).dir $(db_file).pag"
+ DBM_HEADER='<ndbm.h>'
+ PKG_CHECK_MODULES(XORG, [xorg-server])
+ RGB_CFLAGS="$RGB_CFLAGS $XORG_CFLAGS"
+ RGB_DB_FILES='$(db_file).dir $(db_file).pag'
;;
esac
+if test x$DBM_HEADER != x ; then
+ AC_DEFINE_UNQUOTED([DBM_HEADER], [$DBM_HEADER],
+ [Header file to include for dbm functions])
+fi
+AC_SUBST([RGB_DB_TYPE])
AC_SUBST([RGB_DB_FILES])
-AM_CONDITIONAL(RGB_TXT, [test x$db_type = xtext])
+AM_CONDITIONAL(RGB_DB, [test x$db_type != xtext])
-PKG_CHECK_MODULES(RGB, xproto)
AC_SUBST(RGB_CFLAGS)
XORG_MANPAGE_SECTIONS
diff --git a/app/rgb/rgb.c b/app/rgb/rgb.c
index 8712be990..50c8ef604 100644
--- a/app/rgb/rgb.c
+++ b/app/rgb/rgb.c
@@ -1,5 +1,3 @@
-/* $Xorg: rgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */
-/* $XdotOrg: app/rgb/rgb.c,v 1.4 2005/11/08 06:33:31 jkj Exp $ */
/*
Copyright 1985, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/rgb/rgb.c,v 3.8tsi Exp $ */
/* reads from standard input lines of the form:
@@ -39,14 +36,8 @@ from The Open Group.
# include "config.h"
#endif
-#ifdef NDBM
-#include <ndbm.h>
-#else
-#if defined(SVR4)
-#include <rpcsvc/dbm.h>
-#else
-#include <dbm.h>
-#endif
+#include DBM_HEADER
+#ifndef NDBM
#define dbm_open(name,flags,mode) (!dbminit(name))
#define dbm_store(db,key,content,flags) (store(key,content))
#define dbm_close(db) dbmclose()
@@ -57,23 +48,14 @@ from The Open Group.
#include <stdlib.h>
#include <X11/Xos.h>
#include "rgb.h"
-#include "site.h"
#include <ctype.h>
#include <errno.h>
-char *ProgramName;
-
-char *SysError ()
-{
- register char *s = strerror(errno);
- return s ? s : "?";
-}
+static char *ProgramName;
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
char *dbname;
char line[512];
diff --git a/app/rgb/rgb.txt b/app/rgb/rgb.txt
index 62eb8961e..51423c60f 100644
--- a/app/rgb/rgb.txt
+++ b/app/rgb/rgb.txt
@@ -1,4 +1,3 @@
-! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $
255 250 250 snow
248 248 255 ghost white
248 248 255 GhostWhite
diff --git a/app/rgb/showrgb.c b/app/rgb/showrgb.c
index fcd042648..78db6769b 100644
--- a/app/rgb/showrgb.c
+++ b/app/rgb/showrgb.c
@@ -1,6 +1,4 @@
/*
- * $Xorg: showrgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
- * $XdotOrg: app/rgb/showrgb.c,v 1.5 2005/11/08 06:33:31 jkj Exp $
*
Copyright 1989, 1998 The Open Group
@@ -27,21 +25,13 @@ in this Software without prior written authorization from The Open Group.
* Author: Jim Fulton, MIT X Consortium
*/
-/* $XFree86: xc/programs/rgb/showrgb.c,v 3.8 2001/12/14 20:01:04 dawes Exp $ */
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifndef USE_RGB_TXT
-#ifdef NDBM
-#include <ndbm.h>
-#else
-#if defined(SVR4)
-#include <rpcsvc/dbm.h>
-#else
-#include <dbm.h>
-#endif
+#include DBM_HEADER
+#ifndef NDBM
#define dbm_open(name,flags,mode) (!dbminit(name))
#define dbm_firstkey(db) (firstkey())
#define dbm_fetch(db,key) (fetch(key))
@@ -55,11 +45,10 @@ in this Software without prior written authorization from The Open Group.
#include <stdlib.h>
#ifndef USE_RGB_TXT
#include "rgb.h" /* off in server/include/ */
-#include "site.h"
#endif
#include <X11/Xfuncs.h>
-char *ProgramName;
+static char *ProgramName;
static void dumprgb(char *filename);
int
@@ -77,8 +66,7 @@ main (int argc, char *argv[])
#ifndef USE_RGB_TXT
static void
-dumprgb (filename)
- char *filename;
+dumprgb (char *filename)
{
#ifdef NDBM
DBM *rgb_dbm;
diff --git a/app/rgb/showrgb.man b/app/rgb/showrgb.man
index 47789350d..9d07c0d95 100644
--- a/app/rgb/showrgb.man
+++ b/app/rgb/showrgb.man
@@ -1,4 +1,3 @@
-.\" $Xorg: showrgb.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $
.\" Copyright 1993, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,11 +22,9 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.7 2001/12/14 20:01:04 dawes Exp $
-.\"
.TH SHOWRGB 1 __xorgversion__
.SH NAME
-showrgb \- uncompile an rgb color-name database
+showrgb \- display an rgb color-name database
.SH SYNOPSIS
.B showrgb
[
@@ -36,13 +33,13 @@ showrgb \- uncompile an rgb color-name database
.SH DESCRIPTION
The
.I showrgb
-program reads an rgb color-name database compiled for use with the dbm
-database routines and converts it back to source form, printing the
+program reads an rgb color-name database from a __RGB_DB_TYPE__ file
+and converts it back to source form, printing the
result to standard output. The default
database is the one that X was built with, and may be overridden on
the command line. Specify the database name without
-the \fI.pag\fP or \fI.dir\fP suffix.
+the \fI.txt\fP, \fI.pag\fP or \fI.dir\fP suffix.
.SH FILES
.TP 20
-.I __projectroot__/lib/X11/rgb
+.I __RGB_DB__
default database.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 20:58:30 +0000