aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorKaroly Lorentey2005-12-12 03:15:52 +0000
committerKaroly Lorentey2005-12-12 03:15:52 +0000
commit5f6a587f307d47878dfa44058c613fefab4ecac3 (patch)
tree0e01b9c4d14238d1d8af843268ded8d9dba7e426 /configure
parentd68058039e1ff5635b2e44509fc242de4f0a286f (diff)
downloademacs-5f6a587f307d47878dfa44058c613fefab4ecac3.tar.gz
emacs-5f6a587f307d47878dfa44058c613fefab4ecac3.zip
Prevent core dumps with GTK by disabling secondary X connections there.
* src/xterm.c (x_term_init) [!HAVE_GTK_MULTIDISPLAY]: Refuse to create secondary X connections. * configure.in (HAVE_GTK_MULTIDISPLAY): Disable test, unconditionally undefine. * configure: Regenerate. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-450
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure109
1 files changed, 1 insertions, 108 deletions
diff --git a/configure b/configure
index 1cf5f21d0b2..3b188fa7728 100755
--- a/configure
+++ b/configure
@@ -9964,115 +9964,8 @@ _ACEOF
9964 with_toolkit_scroll_bars=yes 9964 with_toolkit_scroll_bars=yes
9965 fi 9965 fi
9966 9966
9967 HAVE_GTK_MULTIDISPLAY=no 9967 HAVE_GTK_MULTIDISPLAY=no
9968 9968
9969for ac_func in gdk_display_open
9970do
9971as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
9972echo "$as_me:$LINENO: checking for $ac_func" >&5
9973echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
9974if eval "test \"\${$as_ac_var+set}\" = set"; then
9975 echo $ECHO_N "(cached) $ECHO_C" >&6
9976else
9977 cat >conftest.$ac_ext <<_ACEOF
9978/* confdefs.h. */
9979_ACEOF
9980cat confdefs.h >>conftest.$ac_ext
9981cat >>conftest.$ac_ext <<_ACEOF
9982/* end confdefs.h. */
9983/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
9984 For example, HP-UX 11i <limits.h> declares gettimeofday. */
9985#define $ac_func innocuous_$ac_func
9986
9987/* System header to define __stub macros and hopefully few prototypes,
9988 which can conflict with char $ac_func (); below.
9989 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9990 <limits.h> exists even on freestanding compilers. */
9991
9992#ifdef __STDC__
9993# include <limits.h>
9994#else
9995# include <assert.h>
9996#endif
9997
9998#undef $ac_func
9999
10000/* Override any gcc2 internal prototype to avoid an error. */
10001#ifdef __cplusplus
10002extern "C"
10003{
10004#endif
10005/* We use char because int might match the return type of a gcc2
10006 builtin and then its argument prototype would still apply. */
10007char $ac_func ();
10008/* The GNU C library defines this for functions which it implements
10009 to always fail with ENOSYS. Some functions are actually named
10010 something starting with __ and the normal name is an alias. */
10011#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
10012choke me
10013#else
10014char (*f) () = $ac_func;
10015#endif
10016#ifdef __cplusplus
10017}
10018#endif
10019
10020int
10021main ()
10022{
10023return f != $ac_func;
10024 ;
10025 return 0;
10026}
10027_ACEOF
10028rm -f conftest.$ac_objext conftest$ac_exeext
10029if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10030 (eval $ac_link) 2>conftest.er1
10031 ac_status=$?
10032 grep -v '^ *+' conftest.er1 >conftest.err
10033 rm -f conftest.er1
10034 cat conftest.err >&5
10035 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10036 (exit $ac_status); } &&
10037 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
10038 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10039 (eval $ac_try) 2>&5
10040 ac_status=$?
10041 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10042 (exit $ac_status); }; } &&
10043 { ac_try='test -s conftest$ac_exeext'
10044 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10045 (eval $ac_try) 2>&5
10046 ac_status=$?
10047 echo "$as_me:$LINENO: \$? = $ac_status" >&5
10048 (exit $ac_status); }; }; then
10049 eval "$as_ac_var=yes"
10050else
10051 echo "$as_me: failed program was:" >&5
10052sed 's/^/| /' conftest.$ac_ext >&5
10053
10054eval "$as_ac_var=no"
10055fi
10056rm -f conftest.err conftest.$ac_objext \
10057 conftest$ac_exeext conftest.$ac_ext
10058fi
10059echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
10060echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
10061if test `eval echo '${'$as_ac_var'}'` = yes; then
10062 cat >>confdefs.h <<_ACEOF
10063#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
10064_ACEOF
10065 HAVE_GTK_MULTIDISPLAY=yes
10066fi
10067done
10068
10069 if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then
10070
10071cat >>confdefs.h <<\_ACEOF
10072#define HAVE_GTK_MULTIDISPLAY 1
10073_ACEOF
10074
10075 fi
10076 HAVE_GTK_FILE_SELECTION=no 9969 HAVE_GTK_FILE_SELECTION=no
10077 9970
10078for ac_func in gtk_file_selection_new 9971for ac_func in gtk_file_selection_new