diff --git a/ChangeLog b/ChangeLog index c6c9feb861..a6abbcd9a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jun 12 14:41:43 2002 Owen Taylor + + * configure.in: Fix some problems with case statements + for checking for omitted deps. (#84202, Jacob Berkman.) + + * configure.in: Remove USE_X11R6_XIM checks since we + no longer use them. + Wed Jun 12 14:18:45 2002 Owen Taylor * gtk/gtkimcontextsimple.c: Add compose sequences diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c6c9feb861..a6abbcd9a2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Wed Jun 12 14:41:43 2002 Owen Taylor + + * configure.in: Fix some problems with case statements + for checking for omitted deps. (#84202, Jacob Berkman.) + + * configure.in: Remove USE_X11R6_XIM checks since we + no longer use them. + Wed Jun 12 14:18:45 2002 Owen Taylor * gtk/gtkimcontextsimple.c: Add compose sequences diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c6c9feb861..a6abbcd9a2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Wed Jun 12 14:41:43 2002 Owen Taylor + + * configure.in: Fix some problems with case statements + for checking for omitted deps. (#84202, Jacob Berkman.) + + * configure.in: Remove USE_X11R6_XIM checks since we + no longer use them. + Wed Jun 12 14:18:45 2002 Owen Taylor * gtk/gtkimcontextsimple.c: Add compose sequences diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c6c9feb861..a6abbcd9a2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Wed Jun 12 14:41:43 2002 Owen Taylor + + * configure.in: Fix some problems with case statements + for checking for omitted deps. (#84202, Jacob Berkman.) + + * configure.in: Remove USE_X11R6_XIM checks since we + no longer use them. + Wed Jun 12 14:18:45 2002 Owen Taylor * gtk/gtkimcontextsimple.c: Add compose sequences diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c6c9feb861..a6abbcd9a2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Wed Jun 12 14:41:43 2002 Owen Taylor + + * configure.in: Fix some problems with case statements + for checking for omitted deps. (#84202, Jacob Berkman.) + + * configure.in: Remove USE_X11R6_XIM checks since we + no longer use them. + Wed Jun 12 14:18:45 2002 Owen Taylor * gtk/gtkimcontextsimple.c: Add compose sequences diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c6c9feb861..a6abbcd9a2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Wed Jun 12 14:41:43 2002 Owen Taylor + + * configure.in: Fix some problems with case statements + for checking for omitted deps. (#84202, Jacob Berkman.) + + * configure.in: Remove USE_X11R6_XIM checks since we + no longer use them. + Wed Jun 12 14:18:45 2002 Owen Taylor * gtk/gtkimcontextsimple.c: Add compose sequences diff --git a/acconfig.h b/acconfig.h index 9d853fec64..f9617e62b7 100644 --- a/acconfig.h +++ b/acconfig.h @@ -48,9 +48,6 @@ #undef USE_GMODULE #undef USE_MMX -/* Define to use X11R6 additions to XIM */ -#undef USE_X11R6_XIM - /* Define to use XKB extension */ #undef HAVE_XKB diff --git a/configure.in b/configure.in index a54b4dd279..0ce1cd10e1 100644 --- a/configure.in +++ b/configure.in @@ -180,8 +180,6 @@ AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]] , enable_ansi=no) AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]], , enable_xim="yes") -AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback], - , enable_xim_inst="maybe") AC_ARG_ENABLE(xkb, [ --enable-xkb support XKB [default=maybe]], , enable_xkb="maybe") AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) @@ -967,7 +965,7 @@ if test "x$gdktarget" = "xx11"; then # then we need to repeat the checks. # x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`" - case x_libs in + case "$x_libs" in *-lX11*) pango_omitted_x_deps=no ;; *) pango_omitted_x_deps=yes ;; esac @@ -1110,31 +1108,8 @@ if test "x$gdktarget" = "xx11"; then # Check for XIM support. - AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback, - : , - enable_xim_inst="no", - $x_libs_for_checks) - - # On Solaris, calling XRegisterIMInstantiateCallback seems to - # cause an immediate segfault, so we disable it, unless - # the user specifically forces it to be on. - - if test x$enable_xim_inst = xmaybe ; then - case host in - *-*-solaris*) - enable_xim_inst="no" - ;; - *) - enable_xim_inst="yes" - ;; - esac - fi - if test "x$enable_xim" = "xyes"; then GTK_XIM_FLAGS="-DUSE_XIM" - if test "x$enable_xim_inst" = "xyes"; then - AC_DEFINE(USE_X11R6_XIM) - fi fi # Check for XKB support. @@ -1244,7 +1219,7 @@ if test "x$gdktarget" = "xlinux-fb"; then fi ft2_libs="`$PKG_CONFIG --libs pangoft2`" - case ft2_libs in + case "$ft2_libs" in *-lfreetype*) pango_omitted_ft2_deps=no ;; *) pango_omitted_ft2_deps=yes ;; esac