Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm
Modified Files:
Tag: ETERM-0_10
ChangeLog configure.in
Log Message:
Thu Apr 3 00:31:36 2003 Michael Jennings (mej)
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/ChangeLog,v
retrieving revision 1.278.2.12
retrieving revision 1.278.2.13
diff -u -3 -r1.278.2.12 -r1.278.2.13
--- ChangeLog 3 Mar 2003 06:20:31 -0000 1.278.2.12
+++ ChangeLog 3 Apr 2003 05:31:54 -0000 1.278.2.13
@@ -5037,3 +5037,8 @@
Note that the setting of bold and underline colors using 18 and 19 are
Eterm extensions.
----------------------------------------------------------------------
+Mon Mar 31 19:00:00 2003 Simon Horman (horms)
+
+Fixed compilation problem with XIM support which resulted
+in Eterm segfaulting if the XIM server (kinput2) exited.
+----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/configure.in,v
retrieving revision 1.62.2.5
retrieving revision 1.62.2.6
diff -u -3 -r1.62.2.5 -r1.62.2.6
--- configure.in 8 Jan 2003 19:14:12 -0000 1.62.2.5
+++ configure.in 3 Apr 2003 05:31:54 -0000 1.62.2.6
@@ -1,4 +1,4 @@
-dnl# $Id: configure.in,v 1.62.2.5 2003/01/08 19:14:12 mej Exp $
+dnl# $Id: configure.in,v 1.62.2.6 2003/04/03 05:31:54 mej Exp $
PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/bin
export PATH
@@ -321,19 +321,6 @@
AC_CHECK_LIB(Xext, XShapeQueryExtension, AC_DEFINE(HAVE_X_SHAPE_EXT))
-# check if we need X_LOCALE definition
-AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE), AC_DEFINE(NO_XLOCALE))
-
-# For multibyte selection handling
-if test "$MULTICHAR_ENCODING" != "none"; then
- AC_CHECK_LIB(Xmu, XmuInternAtom)
-fi
-
-# check X11R6 for XIM
-if test "$XIM" = "TRUE"; then
- AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM))
-fi
-
dnl#
dnl# FEATURES
dnl#
@@ -786,6 +773,19 @@
AC_DEFINE(USE_XIM)
XIM="TRUE"
])
+
+# check if we need X_LOCALE definition
+AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE), AC_DEFINE(NO_XLOCALE))
+
+# For multibyte selection handling
+if test "$MULTICHAR_ENCODING" != "none"; then
+ AC_CHECK_LIB(Xmu, XmuInternAtom)
+fi
+
+# check X11R6 for XIM
+if test "$XIM" = "TRUE"; then
+ AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM))
+fi
AC_MSG_CHECKING(for Greek keyboard support)
AC_ARG_ENABLE(greek,
-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb:
Dedicated Hosting for just $79/mo with 500 GB of bandwidth!
No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
