mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-22 07:09:54 +00:00
Re-enable GTK multidisplay support.
* configure.in (HAVE_GTK_MULTIDISPLAY): Remove override. * configure: Regenerate. * xterm.c (x_term_init): Reword error string for GTK. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-598
This commit is contained in:
Karoly Lorentey
parent
6baa22c1ac
commit
fa1b1007ca
102
configure
vendored
102
configure
vendored
@ -11106,7 +11106,107 @@ _ACEOF
|
||||
with_toolkit_scroll_bars=yes
|
||||
fi
|
||||
|
||||
HAVE_GTK_MULTIDISPLAY=no
|
||||
|
||||
for ac_func in gdk_display_open
|
||||
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 { as_var=$as_ac_var; eval "test \"\${$as_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 GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
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
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return $ac_func ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; 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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
ac_res=`eval echo '${'$as_ac_var'}'`
|
||||
{ echo "$as_me:$LINENO: result: $ac_res" >&5
|
||||
echo "${ECHO_T}$ac_res" >&6; }
|
||||
if test `eval echo '${'$as_ac_var'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
HAVE_GTK_MULTIDISPLAY=yes
|
||||
fi
|
||||
done
|
||||
|
||||
if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_GTK_MULTIDISPLAY 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
HAVE_GTK_FILE_SELECTION=no
|
||||
|
||||
|
||||
13
configure.in
13
configure.in
@ -2069,14 +2069,11 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
|
||||
|
||||
dnl Check if we can use multiple displays with this GTK version.
|
||||
dnl If gdk_display_open exists, assume all others are there also.
|
||||
dnl XXX The multidisplay feature is severely broken in current GTK
|
||||
dnl versions. --lorentey
|
||||
HAVE_GTK_MULTIDISPLAY=no
|
||||
dnl AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes)
|
||||
dnl if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then
|
||||
dnl AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1,
|
||||
dnl [Define to 1 if GTK can handle more than one display.])
|
||||
dnl fi
|
||||
AC_CHECK_FUNCS(gdk_display_open, HAVE_GTK_MULTIDISPLAY=yes)
|
||||
if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then
|
||||
AC_DEFINE(HAVE_GTK_MULTIDISPLAY, 1,
|
||||
[Define to 1 if GTK can handle more than one display.])
|
||||
fi
|
||||
|
||||
dnl Check if we have the old file selection dialog.
|
||||
dnl If gdk_display_open exists, assume all others are there also.
|
||||
|
||||
@ -10566,13 +10566,8 @@ x_term_init (display_name, xrm_option, resource_name)
|
||||
than zero, we are probably on GTK 2.0, which can only handle
|
||||
one display. GTK 2.2 or later can handle more than one. */
|
||||
if (xg_display_open (SDATA (display_name), &dpy) < 0)
|
||||
error ("Sorry, this version of GTK can only handle one display");
|
||||
#else
|
||||
/* XXX Unfortunately, multiple display support is severely broken
|
||||
in recent GTK versions, so HAVE_GTK_MULTIDISPLAY is
|
||||
unconditionally disabled in configure.in. */
|
||||
error ("Sorry, multiple display support is broken in current GTK versions");
|
||||
#endif
|
||||
error ("Sorry, this version of GTK can only handle one display");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user