AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some problems with case statements for checking for omitted deps.

Browse Source 
Wed Jun 12 14:41:43 2002  Owen Taylor  <otaylor@redhat.com>

        * 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.
This commit is contained in:
Owen Taylor 2002-06-12 18:48:10 +00:00 committed by Owen Taylor
parent 1ec62a0906
commit 020832549a
8 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Jun 12 14:41:43 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Wed Jun 12 14:18:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add compose sequences * gtk/gtkimcontextsimple.c: Add compose sequences

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Wed Jun 12 14:41:43 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Wed Jun 12 14:18:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add compose sequences * gtk/gtkimcontextsimple.c: Add compose sequences

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
Wed Jun 12 14:41:43 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Wed Jun 12 14:18:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add compose sequences * gtk/gtkimcontextsimple.c: Add compose sequences

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Wed Jun 12 14:41:43 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Wed Jun 12 14:18:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add compose sequences * gtk/gtkimcontextsimple.c: Add compose sequences

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Wed Jun 12 14:41:43 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Wed Jun 12 14:18:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add compose sequences * gtk/gtkimcontextsimple.c: Add compose sequences

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Wed Jun 12 14:41:43 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Wed Jun 12 14:18:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add compose sequences * gtk/gtkimcontextsimple.c: Add compose sequences

3
acconfig.h
View File

@ -48,9 +48,6 @@
#undef USE_GMODULE #undef USE_GMODULE
#undef USE_MMX #undef USE_MMX
/* Define to use X11R6 additions to XIM */
#undef USE_X11R6_XIM
/* Define to use XKB extension */ /* Define to use XKB extension */
#undef HAVE_XKB #undef HAVE_XKB

29
configure.in
View File

@ -180,8 +180,6 @@ AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]]
, enable_ansi=no) , enable_ansi=no)
AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]], AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],
, enable_xim="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]], AC_ARG_ENABLE(xkb, [ --enable-xkb support XKB [default=maybe]],
, enable_xkb="maybe") , enable_xkb="maybe")
AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) 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. # then we need to repeat the checks.
# #
x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`" x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
case x_libs in case "$x_libs" in
*-lX11*) pango_omitted_x_deps=no ;; *-lX11*) pango_omitted_x_deps=no ;;
*) pango_omitted_x_deps=yes ;; *) pango_omitted_x_deps=yes ;;
esac esac
@ -1110,31 +1108,8 @@ if test "x$gdktarget" = "xx11"; then
# Check for XIM support. # 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 if test "x$enable_xim" = "xyes"; then
GTK_XIM_FLAGS="-DUSE_XIM" GTK_XIM_FLAGS="-DUSE_XIM"
if test "x$enable_xim_inst" = "xyes"; then
AC_DEFINE(USE_X11R6_XIM)
fi
fi fi
# Check for XKB support. # Check for XKB support.
@ -1244,7 +1219,7 @@ if test "x$gdktarget" = "xlinux-fb"; then
fi fi
ft2_libs="`$PKG_CONFIG --libs pangoft2`" ft2_libs="`$PKG_CONFIG --libs pangoft2`"
case ft2_libs in case "$ft2_libs" in
*-lfreetype*) pango_omitted_ft2_deps=no ;; *-lfreetype*) pango_omitted_ft2_deps=no ;;
*) pango_omitted_ft2_deps=yes ;; *) pango_omitted_ft2_deps=yes ;;
esac esac