diff options
| author | Jody Goldberg <jody@gnome.org> | 2003-11-05 17:28:01 +0000 |
|---|---|---|
| committer | Jody Goldberg <jody@src.gnome.org> | 2003-11-05 17:28:01 +0000 |
| commit | a8cca6d8b80bf8b3c0e726afa1c060740e7c935e (patch) | |
| tree | 20995241fabf680f6995501504c9489db7dee208 | |
| parent | cd2d4b48b7ba28b7d7116b995596e18153a75338 (diff) | |
| download | gnome-control-center-a8cca6d8b80bf8b3c0e726afa1c060740e7c935e.tar.gz | |
http://bugzilla.gnome.org/show_bug.cgi?id=125970 make the x extension
2003-11-05 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=125970
* configure.in : make the x extension check more robust
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | configure.in | 7 |
3 files changed, 22 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2003-11-05 Jody Goldberg <jody@gnome.org> + + http://bugzilla.gnome.org/show_bug.cgi?id=125970 + * configure.in : make the x extension check more robust + 2003-10-24 Kjartan Maraas <kmaraas@gnome.org> * capplets/display/main.c: (create_screen_widgets): Fix @@ -1,3 +1,14 @@ +gnome-control-center 2.4.1 + +Jody: + http://bugzilla.gnome.org/show_bug.cgi?id=125970 + * make the x extension check more robust + +Kjartan: + http://bugzilla.gnome.org/show_bug.cgi?id=125403. + * leak fix in display capplet + +------------------------------------------------------------------------------ gnome-control-center 2.1.6 Jody: diff --git a/configure.in b/configure.in index a2e0ab835..591f13ba6 100644 --- a/configure.in +++ b/configure.in @@ -50,7 +50,12 @@ x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" dnl keyboard-properties-capplet savecppflags=$CPPFLAGS 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_CHECK_HEADERS(X11/extensions/XKB.h) CPPFLAGS=$savecppflags |