Re: [gnome-cyr] help with gkb

["Dmitry G. Mastrukov" =?koi8-r?q?=E4=CD=C9=D4=D2=C9=CA_?==?koi8-r?q?=E7=C5=CE=CE=C1=C4=D8=C5=D7=C9=DE_?==?koi8-r?q?=ED=C1=D3=D4=D2=C0=CB=CF=D7?= <dmitry taurussoft org>]

В Срд, 22.05.2002, в 21:33, Sergey V. Udaltsov написал:
> > Да, очень хотелось бы получить это поскорее...
> Дык попробуйте же собрать (хотите - последнюю стабильную версию, хотите
> - из CVS). Заодно и мне расскажете.
> 
Даже и пробовать не надо - под второй Гном не соберётся.
Я попробую подточить - но не знаю насколько получится.
А пока получай патч для libxklavier (сегодняшний CVS). Как я понимаю,
gswitchit из CVS зависит от неё. Этот патч добавляет pkgconfig'изацию, а
также определение libxml2 через pkgconfig, а не через libxml-config.

Дмитрий

diff -urN libxklavier.orig/Makefile.am libxklavier/Makefile.am
--- libxklavier.orig/Makefile.am	Wed Apr 10 18:35:59 2002
+++ libxklavier/Makefile.am	Thu May 23 12:45:33 2002
@@ -1,4 +1,7 @@
 SUBDIRS = src 
 
-EXTRA_DIST = libxklavier.spec libxklavier.spec.in \
+EXTRA_DIST = libxklavier.pc.in libxklavier.spec libxklavier.spec.in \
         CREDITS 
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libxklavier.pc
diff -urN libxklavier.orig/config.h.in libxklavier/config.h.in
--- libxklavier.orig/config.h.in	Sat May 18 05:41:31 2002
+++ libxklavier/config.h.in	Thu May 23 12:51:31 2002
@@ -1,7 +1,5 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
+/* config.h.in.  Generated from configure.in by autoheader.  */
+#undef DEB_KBD
 
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
@@ -10,24 +8,68 @@
 #undef HAVE_STPCPY
 #undef XKB_BASE
 
-/* Define if you have the nl_langinfo function.  */
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#undef HAVE_LANGINFO_CODESET
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
-/* Define if you have the setlocale function.  */
+/* Define to 1 if you have the `setlocale' function. */
 #undef HAVE_SETLOCALE
 
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
 
-/* Define if you have the <langinfo.h> header file.  */
-#undef HAVE_LANGINFO_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
 
 /* Name of package */
 #undef PACKAGE
 
-/* Version number of package */
-#undef VERSION
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
 
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#undef HAVE_LANGINFO_CODESET
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
 
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
diff -urN libxklavier.orig/configure.in libxklavier/configure.in
--- libxklavier.orig/configure.in	Sat May 18 05:41:31 2002
+++ libxklavier/configure.in	Thu May 23 13:08:16 2002
@@ -24,7 +24,6 @@
 AC_ARG_PROGRAM
 AM_PROG_LIBTOOL
 
-AM_PATH_XML2
 
 dnl From Bruno Haible.
 dnl From gnoome-vfs
@@ -62,6 +61,12 @@
 
 AC_DEFINE_UNQUOTED(XKB_BASE,"${xkb_base}")
 
+dnl Checks for libraries.
+PKG_CHECK_MODULES(XML, \
+	libxml-2.0 >= 2.0.0)
+AC_SUBST(XML_LIBS)
+AC_SUBST(XML_CFLAGS)
+
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
@@ -69,5 +74,6 @@
 Makefile
 src/Makefile
 libxklavier.spec
+libxklavier.pc
 ])
 
diff -urN libxklavier.orig/libxklavier.pc.in libxklavier/libxklavier.pc.in
--- libxklavier.orig/libxklavier.pc.in	Thu Jan  1 03:00:00 1970
+++ libxklavier/libxklavier.pc.in	Thu May 23 12:59:34 2002
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: libxklavier
+Description: libxklavier library
+Requires: libxml-2.0
+Version: @VERSION@
+Libs: -L${libdir} -llibxklavier
+Cflags: -I${includedir}/libxklavier