mirror of
https://github.com/gnustep/libs-back.git
synced 2025-04-22 23:42:16 +00:00
configure.in: Check for Xutf8LookupString
Source/x11/XIMInputServer.m: Use it. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@22172 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
684c01e984
commit
e33d340cd6
5 changed files with 115 additions and 1 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2005-12-16 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Check for Xutf8LookupString
|
||||
* Source/x11/XIMInputServer.m: Use it.
|
||||
|
||||
2005-12-10 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/x11/XGServerWindow.m (-titlewindow::): Use UTF8 window
|
||||
|
|
|
|||
|
|
@ -141,10 +141,12 @@
|
|||
{
|
||||
[dbuf setLength: BUF_LEN];
|
||||
#ifdef HAVE_UTF8
|
||||
#ifdef HAVE_XUTF8LOOKUPSTRING
|
||||
if (encoding == NSUTF8StringEncoding)
|
||||
count = Xutf8LookupString(windev->ic, event, buf, BUF_LEN,
|
||||
&keysym, &status);
|
||||
else
|
||||
#endif
|
||||
#endif
|
||||
count = XmbLookupString(windev->ic, event, buf, BUF_LEN,
|
||||
&keysym, &status);
|
||||
|
|
|
|||
|
|
@ -77,9 +77,13 @@
|
|||
/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XSHM_H
|
||||
|
||||
/* Define if you have a functional XFreeType installation, including libXft. */
|
||||
/* Define if you have a functional XFreeType installation, including libXft.
|
||||
*/
|
||||
#undef HAVE_XFT
|
||||
|
||||
/* Define to 1 if you have the `Xutf8LookupString' function. */
|
||||
#undef HAVE_XUTF8LOOKUPSTRING
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
|
||||
|
|
|
|||
102
configure
vendored
102
configure
vendored
|
|
@ -5295,6 +5295,108 @@ else
|
|||
have_xftpgs=no
|
||||
fi
|
||||
|
||||
|
||||
for ac_func in Xutf8LookupString
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_var+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
|
||||
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||||
#define $ac_func innocuous_$ac_func
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func (); below.
|
||||
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
<limits.h> exists even on freestanding compilers. */
|
||||
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
|
||||
#undef $ac_func
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char $ac_func ();
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
|
||||
choke me
|
||||
#else
|
||||
char (*f) () = $ac_func;
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return f != $ac_func;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_var=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_var=no"
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
echo "$as_me:$LINENO: checking for FcPatternCreate in -lfontconfig" >&5
|
||||
echo $ECHO_N "checking for FcPatternCreate in -lfontconfig... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_fontconfig_FcPatternCreate+set}" = set; then
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@ if test $WITH_XFT = yes; then
|
|||
AC_DEFINE(HAVE_UTF8,1,[Define if you have XftDrawStringUtf8])
|
||||
fi
|
||||
AC_CHECK_LIB(Xft, XftPatternGetString, have_xftpgs=yes, have_xftpgs=no)
|
||||
AC_HAVE_FUNCS(Xutf8LookupString)
|
||||
AC_CHECK_LIB(fontconfig, FcPatternCreate, have_fc=yes, have_fc=no)
|
||||
AC_CHECK_HEADER(fontconfig/fontconfig.h)
|
||||
if test "$have_fc" = yes -a "$ac_cv_header_fontconfig_fontconfig_h" = yes; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue