diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2003-06-26 21:09:11 +0000 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2003-06-26 21:09:11 +0000 |
commit | 937562b76a966423c2faec9f2d84bec3db130a1c (patch) | |
tree | 74d8f7e567d1353ed8941350b09f2fc3dc776676 /configure | |
parent | b103a8365afb4e084fd3eb14b6a1227ef6b0e955 (diff) | |
download | emacs-937562b76a966423c2faec9f2d84bec3db130a1c.tar.gz |
configure: Regenerate
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 63 |
1 files changed, 60 insertions, 3 deletions
diff --git a/configure b/configure index 9927b159748..9c3d5403a84 100755 --- a/configure +++ b/configure @@ -3397,12 +3397,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ + '#include <stdlib.h>' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ 'extern "C" void exit (int);' \ - 'void exit (int);' \ - '#include <stdlib.h>' + 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" @@ -5032,10 +5032,11 @@ fi + for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ - sys/param.h sys/vlimit.h sys/resource.h locale.h + sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -8893,6 +8894,62 @@ cat >>confdefs.h <<\_ACEOF #define USE_XIM 1 _ACEOF + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include <X11/Xlib.h> +#include <X11/Xresource.h> +int +main () +{ +Display *display; +XrmDatabase db; +char *res_name; +char *res_class; +XIMProc callback; +XPointer *client_data; +(void)XRegisterIMInstantiateCallback(display, db, res_name, res_class, callback, + client_data); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (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 + emacs_cv_arg6_star=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + if test "$emacs_cv_arg6_star" = yes; then + cat >>confdefs.h <<\_ACEOF +#define XRegisterIMInstantiateCallback_arg6 XPointer* +_ACEOF + + else + cat >>confdefs.h <<\_ACEOF +#define XRegisterIMInstantiateCallback_arg6 XPointer +_ACEOF + + fi fi ### Use -lXpm if available, unless `--with-xpm=no'. |