applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://bugzilla.gnome.org/show_bug.cgi?id=125970 make x extension check

Browse source 
2003-11-05  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=125970
	* configure.in : make x extension check more robust

2003-11-03  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=120842
	* gnome-accessibility-keyboard-properties.c : older xservers require
	  X11/Xlib.h too, its not sun specific.
This commit is contained in:
Jody Goldberg 2003-11-05 17:29:16 +00:00 • committed by Jody Goldberg
parent 03fb1e0f27
commit ebb3a64d20
5 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-11-05 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=125970
* configure.in : make x extension check more robust
2003-10-28 Jody Goldberg <jody@gnome.org> 2003-10-28 Jody Goldberg <jody@gnome.org>
* configure.in : post release bump * configure.in : post release bump

8
NEWS
View file

@ -1,3 +1,11 @@
gnome-control-center 2.5.1
Jody:
http://bugzilla.gnome.org/show_bug.cgi?id=125899
http://bugzilla.gnome.org/show_bug.cgi?id=125970
* Fix the build and configure on older X servers.
------------------------------------------------------------------------------
gnome-control-center 2.5.0 gnome-control-center 2.5.0
Jody: Jody:

6
capplets/accessibility/keyboard/ChangeLog
View file

@ -1,3 +1,9 @@
2003-11-03 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=120842
* gnome-accessibility-keyboard-properties.c : older xservers require
X11/Xlib.h too, its not sun specific.
2003-10-28 Jody Goldberg <jody@gnome.org> 2003-10-28 Jody Goldberg <jody@gnome.org>
* Release 2.5.0 * Release 2.5.0

4
capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
View file

@ -33,9 +33,7 @@
#include "accessibility-keyboard.h" #include "accessibility-keyboard.h"
#ifdef HAVE_X11_EXTENSIONS_XKB_H #ifdef HAVE_X11_EXTENSIONS_XKB_H
# ifdef __sun # include <X11/Xlib.h>
# include <X11/Xlib.h>
# endif
# include <X11/XKBlib.h> # include <X11/XKBlib.h>
# include <X11/extensions/XKBstr.h> # include <X11/extensions/XKBstr.h>
# include <gdk/gdk.h> # include <gdk/gdk.h>

7
configure.in
View file

@ -50,7 +50,12 @@ x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
dnl keyboard-properties-capplet dnl keyboard-properties-capplet
savecppflags=$CPPFLAGS savecppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc") AC_CHECK_HEADERS([X11/Xlib.h])
AC_CHECK_HEADERS([X11/extensions/xf86misc.h], [XF86MISC_LIBS="-lXxf86misc"],[],
[#if HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#endif
])
AC_SUBST(XF86MISC_LIBS) AC_SUBST(XF86MISC_LIBS)
AC_CHECK_HEADERS(X11/extensions/XKB.h) AC_CHECK_HEADERS(X11/extensions/XKB.h)
CPPFLAGS=$savecppflags CPPFLAGS=$savecppflags