From c89bbbc257fb2cf46c2b3dd15bae1f45bde435b1 Mon Sep 17 00:00:00 2001 From: George Lebl Date: Aug 08 2003 18:49:05 +0000 Subject: Release 2.4.1.6 Fri Aug 08 09:50:28 2003 George Lebl * Release 2.4.1.6 * configure.in: use the Xinerama check from HEAD since this one was a bit broken it seems --- diff --git a/ChangeLog b/ChangeLog index d637bbb..a6bf099 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Aug 08 09:50:28 2003 George Lebl + + * Release 2.4.1.6 + + * configure.in: use the Xinerama check from HEAD since this + one was a bit broken it seems + Mon Aug 04 15:06:09 2003 George Lebl * daemon/xdmcp.c: fix checking auth string diff --git a/NEWS b/NEWS index 93edf0a..bdcf375 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,17 @@ Ahh news... +2.4.1.6 stuff: + +- Backport the errorgui from HEAD, easier then fixing + the bugs. + +- Actually insure /tmp/.ICE-unix (#118878) + +- Fix some crashes in main daemon + +- Fix the language checking code to not mess up when LC_ALL + and LC_MESSAGES are not the same + 2.4.1.5 stuff: - When at lower resolutions use smaller fonts (rh #83369) diff --git a/configure.in b/configure.in index a7bdc8a..5830da6 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ dnl AC_PROG_INTLTOOL([0.21]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gdm,2.4.1.5) +AM_INIT_AUTOMAKE(gdm,2.4.1.6) AM_MAINTAINER_MODE GDK_PIXBUF_REQUIRED=1.3.1 @@ -351,18 +351,32 @@ AC_SUBST(GDMXNESTCHOOSER) # # X11 Xinerama extension # +ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" XINERAMA_LIBS= +XINERAMA_SUPPORT=no if test x$with_xinerama != xno ; then - AC_CHECK_HEADER(X11/extensions/Xinerama.h, [ - AC_CHECK_LIB(Xinerama, XineramaQueryScreens, [ - AC_DEFINE(HAVE_LIBXINERAMA) - XINERAMA_LIBS="-lXinerama" - XINERAMA_SUPPORT=yes],,$[X_LIBS -lX11 -lXext $X_EXTRA_LIBS]) - ]) + xinerama_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" - if test x$with_xinerama = xyes -a x$XINERAMA_SUPPORT = x ; then + AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + [AC_CHECK_HEADER(X11/extensions/Xinerama.h, + if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then + X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS" + fi + AC_DEFINE(HAVE_LIBXINERAMA) + XINERAMA_LIBS="-lXinerama" + XINERAMA_SUPPORT=yes, + XINERAMA_SUPPORT=no, + [#include ])], + XINERAMA_SUPPORT=no, -lXext $ALL_X_LIBS) + AC_MSG_CHECKING(for Xinerama support on XFree86) + AC_MSG_RESULT($XINERAMA_SUPPORT); + + if test x$with_xinerama = xyes -a x$XINERAMA_SUPPORT = xno ; then AC_MSG_ERROR(Xinerama support requested but Xinerama libraries not found) fi + + CPPFLAGS="$xinerama_save_cppflags" fi AC_SUBST(XINERAMA_LIBS)