- Add build system for lib/XpmXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10

- Add Xpm to symlink.sh
- Conditionally include config.h in xc/extras/Xpm

43 files changed, 496 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..1f3e437
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,3 @@
+Xpm was originally written by Groupe Bull, but maintainence has since passed
+through the hands of XFree86, and to freedesktop.org; Daniel Stone is the
+current maintainer.
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..446fa4c
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * 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, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 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. IN NO EVENT SHALL
+ * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+Arnaud LE HORS      BULL Research FRANCE -- Koala Project 
+                    (XPM - X PixMap format version 2 & 3)
+    Internet:       lehors@sophia.inria.fr
+Surface Mail:       Arnaud LE HORS, INRIA - Sophia Antipolis, 
+                    2004, route des Lucioles, 06565 Valbonne Cedex -- FRANCE
+ Voice phone:       (33) 93.65.77.71, Fax: (33) 93 65 77 66, Telex: 97 00 50 F
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ChangeLog
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..54caf7c
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..715a05b
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,8 @@
+# Daniel Stone disowns all copyright on this file; no warranty is given as to its
+# suitability or otherwise.
+
+SUBDIRS=src sxpm cxpm
+
+pkgconfigdir=$(libdir)/pkgconfig
+pkgconfig_DATA=xpm.pc
+EXTRA_DIST=xpm.pc.in xpm.PS.gz COPYRIGHT FAQ.html FILES README.AMIGA README.html README.MSW 
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/NEWS
diff --git a/README b/README
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/README
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..07dd683
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,40 @@
+AC_PREREQ(2.57)
+AC_INIT([libXpm], 3.5.2, [daniel@freedesktop.org], libXpm)
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER([config.h])
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XPM, xproto x11)
+AC_SUBST(XPM_CFLAGS)
+AC_SUBST(XPM_LIBS)
+
+# Checks for header files.
+AC_HEADER_STDC
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+if test "x$GCC" = "xyes"; then
+	GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
+	-Wmissing-prototypes -Wmissing-declarations \
+	-Wnested-externs -fno-strict-aliasing"
+	CFLAGS="$GCC_WARNINGS $CFLAGS"
+fi
+
+
+PKG_CHECK_MODULES(SXPM, xt xext, build_sxpm=true, build_sxpm=false)
+
+AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue)
+
+AC_OUTPUT([Makefile
+           src/Makefile
+	   sxpm/Makefile
+	   cxpm/Makefile
+	   xpm.pc])
diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am
new file mode 100644
index 0000000..7066d73
--- /dev/null
+++ b/cxpm/Makefile.am
@@ -0,0 +1,9 @@
+bin_PROGRAMS = cxpm
+
+cxpm_CFLAGS = $(XPM_CFLAGS) -I$(top_builddir)/src -I$(top_srcdir)/include/X11
+
+cxpm_MANS =			\
+	cxpm.1
+
+cxpm_SOURCES =			\
+	cxpm.c
diff --git a/src/Attrib.c b/src/Attrib.c
index 028c2cb..c6b34d6 100644
--- a/src/Attrib.c
+++ b/src/Attrib.c
@@ -34,6 +34,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 /* 3.2 backward compatibility code */
diff --git a/src/CrBufFrI.c b/src/CrBufFrI.c
index 66b2f45..b879715 100644
--- a/src/CrBufFrI.c
+++ b/src/CrBufFrI.c
@@ -36,6 +36,9 @@
 
 /* $XFree86$ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 LFUNC(WriteColors, int, (char **dataptr, unsigned int *data_size,
diff --git a/src/CrBufFrP.c b/src/CrBufFrP.c
index 4aec4fb..44eb56d 100644
--- a/src/CrBufFrP.c
+++ b/src/CrBufFrP.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/CrDatFrI.c b/src/CrDatFrI.c
index 37e7f8c..9099966 100644
--- a/src/CrDatFrI.c
+++ b/src/CrDatFrI.c
@@ -35,6 +35,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size,
diff --git a/src/CrDatFrP.c b/src/CrDatFrP.c
index 1593b7b..20981b7 100644
--- a/src/CrDatFrP.c
+++ b/src/CrDatFrP.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/CrIFrBuf.c b/src/CrIFrBuf.c
index ba863ac..d98e658 100644
--- a/src/CrIFrBuf.c
+++ b/src/CrIFrBuf.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 LFUNC(OpenBuffer, void, (char *buffer, xpmData *mdata));
diff --git a/src/CrIFrDat.c b/src/CrIFrDat.c
index f3c19c7..ab93a49 100644
--- a/src/CrIFrDat.c
+++ b/src/CrIFrDat.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 LFUNC(OpenArray, void, (char **data, xpmData *mdata));
diff --git a/src/CrIFrP.c b/src/CrIFrP.c
index f8aa4ed..144acc4 100644
--- a/src/CrIFrP.c
+++ b/src/CrIFrP.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 void
diff --git a/src/CrPFrBuf.c b/src/CrPFrBuf.c
index 19e7cb9..f3f9030 100644
--- a/src/CrPFrBuf.c
+++ b/src/CrPFrBuf.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/CrPFrDat.c b/src/CrPFrDat.c
index fcbe5f1..483b3af 100644
--- a/src/CrPFrDat.c
+++ b/src/CrPFrDat.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/CrPFrI.c b/src/CrPFrI.c
index 0661a4e..2f555dd 100644
--- a/src/CrPFrI.c
+++ b/src/CrPFrI.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 void
diff --git a/src/Image.c b/src/Image.c
index 0753622..2179d4e 100644
--- a/src/Image.c
+++ b/src/Image.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 /*
diff --git a/src/Info.c b/src/Info.c
index 9bc41c8..f35abd9 100644
--- a/src/Info.c
+++ b/src/Info.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 /*
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..658307d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,46 @@
+# Daniel Stone disowns all copyright on this file.
+
+lib_LTLIBRARIES=libXpm.la
+
+AM_CFLAGS = -I.						\
+	    -I$(top_srcdir)/include/X11/		\
+            $(XPM_CFLAGS)
+
+libXpm_la_LDFLAGS = -version-number 4:5:1 -no-undefined
+libXpm_la_LIBADD =  $(XPM_LIBS)
+
+libXpm_la_SOURCES =					\
+	Attrib.c					\
+	CrBufFrI.c					\
+	CrBufFrP.c					\
+	CrDatFrI.c					\
+	CrDatFrP.c					\
+	CrIFrBuf.c					\
+	CrIFrDat.c					\
+	CrIFrP.c					\
+	CrPFrBuf.c					\
+	CrPFrDat.c					\
+	CrPFrI.c					\
+	Image.c						\
+	Info.c						\
+	RdFToBuf.c					\
+	RdFToDat.c					\
+	RdFToI.c					\
+	RdFToP.c					\
+	WrFFrBuf.c					\
+	WrFFrDat.c					\
+	WrFFrI.c					\
+	WrFFrP.c					\
+	XpmI.h						\
+	create.c					\
+	data.c						\
+	hashtab.c					\
+	misc.c						\
+	parse.c						\
+	rgb.c						\
+	rgbtab.h					\
+	scan.c						\
+	simx.h
+
+libXpmincludedir = $(includedir)/X11
+libXpminclude_HEADERS = $(top_srcdir)/include/X11/xpm.h
diff --git a/src/RdFToBuf.c b/src/RdFToBuf.c
index f6ad75d..222bf18 100644
--- a/src/RdFToBuf.c
+++ b/src/RdFToBuf.c
@@ -39,6 +39,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 #include <sys/stat.h>
 #if !defined(FOR_MSW) && !defined(WIN32)
diff --git a/src/RdFToDat.c b/src/RdFToDat.c
index 4bb28fc..11f753b 100644
--- a/src/RdFToDat.c
+++ b/src/RdFToDat.c
@@ -32,6 +32,9 @@
 *  Developed by Dan Greening dgreen@cs.ucla.edu / dgreen@sti.com              *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/RdFToI.c b/src/RdFToI.c
index e91d5e9..d7a6af1 100644
--- a/src/RdFToI.c
+++ b/src/RdFToI.c
@@ -35,6 +35,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 #ifndef NO_ZPIPE
 #include <fcntl.h>
diff --git a/src/RdFToP.c b/src/RdFToP.c
index 212d260..993824e 100644
--- a/src/RdFToP.c
+++ b/src/RdFToP.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/WrFFrBuf.c b/src/WrFFrBuf.c
index a206b5c..9e0497a 100644
--- a/src/WrFFrBuf.c
+++ b/src/WrFFrBuf.c
@@ -34,6 +34,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/WrFFrDat.c b/src/WrFFrDat.c
index bfaa909..bc0a944 100644
--- a/src/WrFFrDat.c
+++ b/src/WrFFrDat.c
@@ -32,6 +32,9 @@
 *  Developed by Dan Greening dgreen@cs.ucla.edu / dgreen@sti.com              *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/WrFFrI.c b/src/WrFFrI.c
index c280641..363f6c4 100644
--- a/src/WrFFrI.c
+++ b/src/WrFFrI.c
@@ -38,6 +38,9 @@
  * Lorens Younes (d93-hyo@nada.kth.se) 4/96
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 #ifndef NO_ZPIPE
diff --git a/src/WrFFrP.c b/src/WrFFrP.c
index b78ea0c..87ceb88 100644
--- a/src/WrFFrP.c
+++ b/src/WrFFrP.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 int
diff --git a/src/amigax.c b/src/amigax.c
index aa82d49..eb3bc3a 100644
--- a/src/amigax.c
+++ b/src/amigax.c
@@ -33,6 +33,9 @@
 *  Revised 4/96                                                               *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 #include "amigax.h"
 
diff --git a/src/create.c b/src/create.c
index 8bf9d2e..abc9d59 100644
--- a/src/create.c
+++ b/src/create.c
@@ -47,6 +47,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 #include <ctype.h>
 
diff --git a/src/data.c b/src/data.c
index cfd1007..d0b86ee 100644
--- a/src/data.c
+++ b/src/data.c
@@ -43,6 +43,9 @@ static char *RCS_Version = "$XpmVersion: 3.4k $";
 /* Internal version number */
 static char *RCS_Id = "Id: xpm.shar,v 3.71 1998/03/19 19:47:14 lehors Exp $";
 #endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 #endif
 #include <ctype.h>
diff --git a/src/hashtab.c b/src/hashtab.c
index f5a71dd..d2383a4 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -33,6 +33,9 @@
 *                                                                             *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 LFUNC(AtomMake, xpmHashAtom, (char *name, void *data));
diff --git a/src/misc.c b/src/misc.c
index ce80d54..d842e0e 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -32,6 +32,9 @@
 *  Developed by Arnaud Le Hors                                                *
 \*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 #ifdef NEED_STRDUP
diff --git a/src/parse.c b/src/parse.c
index 73ed6b2..e7b3378 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -43,6 +43,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 #include <ctype.h>
 #include <string.h>
diff --git a/src/rgb.c b/src/rgb.c
index b26ee3f..0a5af8b 100644
--- a/src/rgb.c
+++ b/src/rgb.c
@@ -42,6 +42,9 @@
  * W. Snitily but has been modified for my special need
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 #include <ctype.h>
 
diff --git a/src/scan.c b/src/scan.c
index 28191e8..e8e4c27 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -45,6 +45,9 @@
 
 /* October 2004, source code review by Thomas Biege <thomas@suse.de> */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "XpmI.h"
 
 #define MAXPRINTABLE 92			/* number of printable ascii chars
diff --git a/src/simx.c b/src/simx.c
index 5e5537d..97b3b5f 100644
--- a/src/simx.c
+++ b/src/simx.c
@@ -35,6 +35,9 @@
 
 #ifdef FOR_MSW
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xpm.h"
 #include "xpmi.h"			/* for XpmMalloc */
 
diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am
new file mode 100644
index 0000000..57d0c54
--- /dev/null
+++ b/sxpm/Makefile.am
@@ -0,0 +1,18 @@
+if BUILD_SXPM
+
+bin_PROGRAMS = sxpm
+
+sxpm_CFLAGS = $(SXPM_CFLAGS)
+
+sxpm_MANS =			\
+	sxpm.1
+
+sxpm_SOURCES =			\
+	sxpm.c			\
+	plaid_ext.xpm		\
+	plaid_mask.xpm		\
+	plaid.xpm
+
+sxpm_LDADD = $(XPM_LIBS) $(SXPM_LIBS) $(top_builddir)/src/libXpm.la
+
+endif
diff --git a/xpm.pc.in b/xpm.pc.in
new file mode 100644
index 0000000..b666e53
--- /dev/null
+++ b/xpm.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Xpm
+Description: X Pixmap Library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lXpm @XPM_LIBS@ @LIBS@
+Cflags: -I${includedir} @XPM_CFLAGS@