Add xkbui to symlink.sh Don't include XKBFileInt.h in xc/lib/xkbui. InsteadXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13

    just cut and paste the relevant declaration.

12 files changed, 120 insertions, 1 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..ee8a30a
--- /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 = xkbui.pc
+
+EXTRA_DIST = xkbui.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..445a4c6
--- /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(libxkbui, 7.0.0, [sandmann@redhat.com], libxkbui)
+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 xt xkbfile)
+
+AC_SUBST(DEP_CFLAGS)
+AC_SUBST(DEP_LIBS)
+		  
+AC_OUTPUT([Makefile
+	   src/Makefile
+           xkbui.pc])
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..bd04642
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,18 @@
+lib_LTLIBRARIES = libxkbui.la
+
+libxkbui_la_SOURCES = \
+         XKBui.c \
+         XKBuiPriv.h
+
+INCLUDES = -I$(top_srcdir)/include/X11/extensions
+
+libxkbui_la_CFLAGS = @DEP_CFLAGS@
+
+libxkbui_la_LIBADD = @DEP_LIBS@
+
+libxkbui_la_LDFLAGS = -version-info 7:0:0 -no-undefined
+
+
+libxkbuiincludedir = $(includedir)/X11/extensions
+libxkbuiinclude_HEADERS = \
+    $(top_srcdir)/include/X11/extensions/XKBui.h
diff --git a/src/XKBui.c b/src/XKBui.c
index 294bd02..7470716 100644
--- a/src/XKBui.c
+++ b/src/XKBui.c
@@ -40,13 +40,19 @@
 
 #include <X11/Xfuncs.h>
 #include "XKBuiPriv.h"
-#include "XKBfileInt.h"
 #include <X11/extensions/XKBfile.h>
 
 #ifndef M_PI
 #  define M_PI	3.141592653589793238462
 #endif
 
+/* This function is an internal function in the xkbfile library */
+extern int	_XkbStrCaseCmp(
+	char *	/* str1 */,
+	char *	/* str2 */
+);
+
+
 static XkbUI_ViewOptsRec dfltOpts = { 
 	XkbUI_AllViewOptsMask	/* present */,
 	1			/* fg */,
diff --git a/xkbui.pc.in b/xkbui.pc.in
new file mode 100644
index 0000000..4c901a0
--- /dev/null
+++ b/xkbui.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: xkbui
+Description: The xkbui Library
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir} @DEP_CFLAGS@
+Libs: -L${libdir} -lxkbui @DEP_LIBS@
+