[cairo-commit] xsvg ChangeLog,1.34,1.35 configure.in,1.13,1.14

[Keith Packard]

Committed by: keithp

Update of /cvs/cairo/xsvg
In directory gabe:/tmp/cvs-serv14244

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-01-26  Keith Packard  <keithp at keithp.com>

	* configure.in:
	* src/xsvg.c: (win_init), (win_handle_key_press):
	Use keysyms for matching instead of keycodes.
	Allows for multiple keys with same keysym.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/xsvg/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- ChangeLog	15 Jun 2005 22:48:32 -0000	1.34
+++ ChangeLog	26 Jan 2006 04:07:21 -0000	1.35
@@ -1,3 +1,10 @@
+2006-01-26  Keith Packard  <keithp at keithp.com>
+
+	* configure.in:
+	* src/xsvg.c: (win_init), (win_handle_key_press):
+	Use keysyms for matching instead of keycodes.
+	Allows for multiple keys with same keysym.
+
 2005-06-15  Carl Worth  <cworth at cworth.org>
 
 	* NEWS: Add notes for 0.2.1.

Index: configure.in
===================================================================
RCS file: /cvs/cairo/xsvg/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- configure.in	15 Jun 2005 22:48:32 -0000	1.13
+++ configure.in	26 Jan 2006 04:07:21 -0000	1.14
@@ -20,9 +20,34 @@
 
 dnl ===========================================================================
 
-AC_PATH_X
-AC_PATH_XTRA
+PKG_CHECK_MODULES(X, x11,
+		  [x_found_with_pkgconfig=yes],
+		  [x_found_with_pkgconfig=no])
 
+if test "$x_found_with_pkgconfig" = "yes"
+then
+	X_REQUIRES="x11"
+	X_NON_PKG_CFLAGS=""
+	X_NON_PKG_LIBS=""
+else
+	AC_PATH_XTRA
+
+	if test "x$no_x" = "xyes"
+	then
+	        AC_MSG_ERROR([X is required, but it was either disabled or not found.])
+	fi
+
+	# pkg-config adds the -l flag while AC_PATH_XTRA does not
+	
+	X_LIBS="$X_LIBS -lX11"
+	X_REQUIRES=""
+	X_NON_PKG_CFLAGS="$X_CFLAGS"
+	X_NON_PKG_LIBS="$X_LIBS"
+fi
+AC_SUBST(X_REQUIRES)
+AC_SUBST(X_NON_PKG_CFLAGS)
+AC_SUBST(X_NON_PKG_LIBS)
+	
 dnl ===========================================================================
 
 PKG_CHECK_MODULES(XSVG, libsvg-cairo >= 0.1.6)