[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/configure |
Date: |
Thu, 26 Jun 2003 17:09:12 -0400 |
Index: emacs/configure
diff -c emacs/configure:1.111 emacs/configure:1.112
*** emacs/configure:1.111 Fri Jun 6 06:16:42 2003
--- emacs/configure Thu Jun 26 17:09:11 2003
***************
*** 3397,3408 ****
(exit $ac_status); }; }; then
for ac_declaration in \
''\
'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>'
do
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
--- 3397,3408 ----
(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);'
do
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
***************
*** 5032,5041 ****
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
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
--- 5032,5042 ----
+
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/_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,8898 ****
--- 8894,8955 ----
#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'.