summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-13 22:18:29 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-13 22:18:29 +0000
commit46addb77c44cde745228000ff5e3661eab76fa17 (patch)
tree33e543b654ab7dc5eaa1ea1d58d74c1152cf71b1
parent63fc63db6e61d5248c0c8b6b426e6e34b227c85f (diff)
- Conditionally include config.h in xc/lib/OldX/*.c
-rw-r--r--AUTHORS0
-rw-r--r--COPYING0
-rw-r--r--ChangeLog0
-rw-r--r--INSTALL0
-rw-r--r--Makefile.am28
-rw-r--r--NEWS0
-rw-r--r--README0
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.ac44
-rw-r--r--oldx.pc.in11
-rw-r--r--src/Makefile.am22
-rw-r--r--src/XCrAssoc.c3
-rw-r--r--src/XDelAssoc.c3
-rw-r--r--src/XDestAssoc.c3
-rw-r--r--src/XDraw.c3
-rw-r--r--src/XLookAssoc.c3
-rw-r--r--src/XMakeAssoc.c3
17 files changed, 135 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/AUTHORS
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/COPYING
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..e69de29
--- /dev/null
+++ b/INSTALL
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..63ebf76
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,28 @@
+#
+# Copyright 2005 Red Hat, Inc.
+#
+# 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, and that the name of Red Hat not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Red Hat makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL RED HAT BE LIABLE FOR 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.
+
+SUBDIRS = src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = oldx.pc
+
+EXTRA_DIST = oldx.pc.in autogen.sh
+
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..c16998f
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,44 @@
+
+dnl Copyright 2005 Red Hat, Inc.
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation, and that the name of Red Hat not be used in
+dnl advertising or publicity pertaining to distribution of the software without
+dnl specific, written prior permission. Red Hat makes no
+dnl representations about the suitability of this software for any purpose. It
+dnl is provided "as is" without express or implied warranty.
+dnl
+dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.57])
+
+AC_INIT(liboldX, 7.0.0, [sandmann@redhat.com], liboldX)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(config.h)
+
+# Check for progs
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+# Check for dependencies
+PKG_CHECK_MODULES(DEP, x11)
+
+AC_SUBST(DEP_CFLAGS)
+AC_SUBST(DEP_LIBS)
+
+AC_OUTPUT([Makefile
+ src/Makefile
+ oldx.pc])
diff --git a/oldx.pc.in b/oldx.pc.in
new file mode 100644
index 0000000..8e7e1e4
--- /dev/null
+++ b/oldx.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: oldX
+Description: The oldX Library
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir} @DEP_CFLAGS@
+Libs: -L${libdir} -loldX @DEP_LIBS@
+
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..cb48f21
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,22 @@
+lib_LTLIBRARIES = liboldX.la
+
+liboldX_la_SOURCES = \
+ XCrAssoc.c \
+ XDelAssoc.c \
+ XDestAssoc.c \
+ XDraw.c \
+ XLookAssoc.c \
+ XMakeAssoc.c
+
+INCLUDES = -I$(top_srcdir)/include/X11
+
+
+liboldX_la_LIBADD = @DEP_LIBS@
+
+liboldX_la_LDFLAGS = -version-info 7:0:0 -no-undefined
+
+
+liboldXincludedir = $(includedir)/X11
+liboldXinclude_HEADERS = \
+ $(top_srcdir)/include/X11/X10.h
+
diff --git a/src/XCrAssoc.c b/src/XCrAssoc.c
index 76d970b..d36e952 100644
--- a/src/XCrAssoc.c
+++ b/src/XCrAssoc.c
@@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "X11/Xlibint.h"
#include "X10.h"
diff --git a/src/XDelAssoc.c b/src/XDelAssoc.c
index f3cad4e..e7c4b75 100644
--- a/src/XDelAssoc.c
+++ b/src/XDelAssoc.c
@@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.3 2001/01/17 19:43:37 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "X11/Xlibint.h"
#include "X10.h"
diff --git a/src/XDestAssoc.c b/src/XDestAssoc.c
index c4c4d12..672ac23 100644
--- a/src/XDestAssoc.c
+++ b/src/XDestAssoc.c
@@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "X11/Xlibint.h"
#include "X10.h"
diff --git a/src/XDraw.c b/src/XDraw.c
index 2f85d11..3eeff3e 100644
--- a/src/XDraw.c
+++ b/src/XDraw.c
@@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/oldX/XDraw.c,v 1.4 2001/07/25 15:04:57 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "X11/Xlibint.h"
#include "X11/Xlib.h"
#include "X10.h"
diff --git a/src/XLookAssoc.c b/src/XLookAssoc.c
index d0caa92..fe150c9 100644
--- a/src/XLookAssoc.c
+++ b/src/XLookAssoc.c
@@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "X11/Xlibint.h"
#include "X10.h"
diff --git a/src/XMakeAssoc.c b/src/XMakeAssoc.c
index 468d27d..40b3562 100644
--- a/src/XMakeAssoc.c
+++ b/src/XMakeAssoc.c
@@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.3 2001/01/17 19:43:38 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "X11/Xlibint.h"
#include "X10.h"