From 0b4b811191a1e74356b7ff78a09107e29a7ef695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Tue, 17 May 2005 21:25:16 +0000 Subject: - Conditionally include config.h in xc/lib/SM - Add libSM to symlink.sh - Add SM build system --- AUTHORS | 8 ++ COPYING | 21 +++++ ChangeLog | 50 ++++++++++++ INSTALL | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 6 ++ NEWS | 0 README | 0 autogen.sh | 12 +++ configure.ac | 40 ++++++++++ sm.pc.in | 10 +++ src/Makefile.am | 24 ++++++ src/sm_auth.c | 3 + src/sm_client.c | 3 + src/sm_error.c | 3 + src/sm_genid.c | 3 + src/sm_manager.c | 3 + src/sm_misc.c | 3 + src/sm_process.c | 3 + 18 files changed, 421 insertions(+) create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 INSTALL create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 README create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 sm.pc.in create mode 100644 src/Makefile.am diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..d497b13 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,8 @@ +Author: Ralph Mor, X Consortium. + +Some bug fixes by Keith Packard. +OS/2 support, Frank Giessler +IPv6 support, Alan Coopersmith +David Dawes and Dirk Hohndel - bug fixes + +Our apolgies if we've missed anyone. diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..2b3f545 --- /dev/null +++ b/COPYING @@ -0,0 +1,21 @@ +Copyright 1993, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 THE +OPEN GROUP 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 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. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..822c88f --- /dev/null +++ b/ChangeLog @@ -0,0 +1,50 @@ +2005-01-29 Daniel Stone + + * sm_manager.c: + Sync back with X.Org HEAD (change usage of _IceTransGetPeerNetworkId to + IceGetPeerName; AIX build fixes). Use IceGetPeerName instead of + _IceGetPeerName, since it is now in the ICE public API. + +2005-01-19 Daniel Stone + + * configure.ac: + Remove AC_CONFIG_AUX_DIR. + +2004-05-10 Eric Anholt + + * configure.ac: + libSM doesn't require libX11, remove linking. + Don't include warning CFLAGS in .pc file. + Bump to version 6.0.4. + +2004-04-12 Daniel Stone + + * sm_genid.c: + Fix getaddrinfo()-related info (merge from X11R6.7). + + * Tag release 6.0.3 for xlibs 1.0.1. + +2004-02-03 Jim Gettys + + * AUTHORS (Author): + +2004-01-17 Daniel Stone + * Tag release 6.0.2 for first fd.o clientside lib release. + +2004-01-15 Harold L Hunt II + * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. + +2003-10-28 Keith Packard + + * Makefile.am: + * SMlibint.h: + * configure.ac: + * globals.h: + * sm_client.c: (set_callbacks): + * sm_error.c: (_SmcDefaultErrorHandler), (_SmsDefaultErrorHandler): + * sm_manager.c: (_SmsProtocolSetupProc): + * sm_process.c: (_SmcProcessMessage), (_SmsProcessMessage): + Prototypes. + Use new ICEtrans.h header to get defines for ICE xtrans functions. + Add GCC warnings. + Make $(srcdir) != "." work (needed -I${top_srcdir}/include) 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..713eddf --- /dev/null +++ b/Makefile.am @@ -0,0 +1,6 @@ +SUBDIRS=src + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = sm.pc + +EXTRA_DIST=sm.pc.in diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..e69de29 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..89dba99 --- /dev/null +++ b/configure.ac @@ -0,0 +1,40 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.57) +AC_INIT([libSM], + 6.0.4, + [keithp@keithp.com], + libSM) + +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(SM, ice xproto xtrans) +AC_SUBST(SM_CFLAGS) +AC_SUBST(SM_LIBS) + +# Checks for libraries. + +# Checks for header files. +AC_HEADER_STDC + +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 + +AC_OUTPUT([Makefile + src/Makefile + sm.pc]) diff --git a/sm.pc.in b/sm.pc.in new file mode 100644 index 0000000..10f8a1c --- /dev/null +++ b/sm.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: SM +Description: X Session Management Library +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lSM @SM_LIBS@ +Cflags: -I${includedir} @SM_CFLAGS@ diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..678879d --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,24 @@ +lib_LTLIBRARIES=libSM.la + +AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) + +libSM_la_LDFLAGS = -version-info 6:1:0 -no-undefined + +libSM_la_LIBADD = $(SM_LIBS) + +libSM_la_SOURCES = \ + SMlibint.h \ + globals.h \ + sm_auth.c \ + sm_client.c \ + sm_error.c \ + sm_genid.c \ + sm_manager.c \ + sm_misc.c \ + sm_process.c + +smincludedir=$(includedir)/X11/SM +sminclude_HEADERS=\ + $(top_srcdir)/include/X11/SM/SM.h \ + $(top_srcdir)/include/X11/SM/SMlib.h \ + $(top_srcdir)/include/X11/SM/SMproto.h diff --git a/src/sm_auth.c b/src/sm_auth.c index 111235e..9acd371 100644 --- a/src/sm_auth.c +++ b/src/sm_auth.c @@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group. * Author: Ralph Mor, X Consortium */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include "SMlibint.h" diff --git a/src/sm_client.c b/src/sm_client.c index 028262e..02f9ccd 100644 --- a/src/sm_client.c +++ b/src/sm_client.c @@ -30,6 +30,9 @@ in this Software without prior written authorization from The Open Group. * Author: Ralph Mor, X Consortium */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include "SMlibint.h" #include "globals.h" diff --git a/src/sm_error.c b/src/sm_error.c index 8cd7989..50a476e 100644 --- a/src/sm_error.c +++ b/src/sm_error.c @@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group. * Author: Ralph Mor, X Consortium */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include "SMlibint.h" #include diff --git a/src/sm_genid.c b/src/sm_genid.c index 171e762..76e1350 100644 --- a/src/sm_genid.c +++ b/src/sm_genid.c @@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group. #ifdef WIN32 #define _WILLWINSOCK_ #endif +#ifdef HAVE_CONFIG_H +#include +#endif #include #include "SMlibint.h" #ifdef XTHREADS diff --git a/src/sm_manager.c b/src/sm_manager.c index a88fe0d..bdb6f57 100644 --- a/src/sm_manager.c +++ b/src/sm_manager.c @@ -30,6 +30,9 @@ in this Software without prior written authorization from The Open Group. * Author: Ralph Mor, X Consortium */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include "SMlibint.h" #include diff --git a/src/sm_misc.c b/src/sm_misc.c index 9fc3e90..30c2c2d 100644 --- a/src/sm_misc.c +++ b/src/sm_misc.c @@ -30,6 +30,9 @@ in this Software without prior written authorization from The Open Group. * Author: Ralph Mor, X Consortium */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include "SMlibint.h" #include diff --git a/src/sm_process.c b/src/sm_process.c index c770236..ab3ec0b 100644 --- a/src/sm_process.c +++ b/src/sm_process.c @@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group. * Author: Ralph Mor, X Consortium */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include "SMlibint.h" -- cgit v1.2.3