Mercurial > emacs
changeset 73540:e6d2c7dae5c8
* configure: Regenerate using autoconf 2.59.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 29 Oct 2006 22:09:26 +0000 |
| parents | db045c86d29b |
| children | 964e568f1d1d |
| files | ChangeLog configure |
| diffstat | 2 files changed, 32 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Oct 29 21:54:18 2006 +0000 +++ b/ChangeLog Sun Oct 29 22:09:26 2006 +0000 @@ -1,3 +1,7 @@ +2006-10-29 Chong Yidong <cyd@stupidchicken.com> + + * configure: Regenerate using autoconf 2.59. + 2006-10-29 Jeramey Crawford <jeramey@jeramey.com> * configure.in: Enable x86-64 OpenBSD compilation.
--- a/configure Sun Oct 29 21:54:18 2006 +0000 +++ b/configure Sun Oct 29 22:09:26 2006 +0000 @@ -1757,6 +1757,7 @@ case "${canonical}" in alpha*-*-openbsd*) machine=alpha ;; i386-*-openbsd*) machine=intel386 ;; + x86_64-*-openbsd*) machine=amdx86-64 ;; m68k-*-openbsd*) machine=hp9000s300 ;; mipsel-*-openbsd*) machine=pmax ;; ns32k-*-openbsd*) machine=ns32000 ;; @@ -8423,7 +8424,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Xlib.h> +#include <X11/Intrinsic.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -8450,7 +8451,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -8464,18 +8465,18 @@ # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <X11/Xlib.h> -int -main () -{ -XrmInitialize () + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <X11/Intrinsic.h> +int +main () +{ +XtMalloc (0) ; return 0; } @@ -8513,7 +8514,7 @@ do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libX11.$ac_extension; then + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -22130,24 +22131,18 @@ ac_cv_func_fork_works=cross else cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* By Ruediger Kuhlmann. */ - if (fork() < 0) - exit (1); - exit (0); - - ; - return 0; -} +/* By Ruediger Kuhlmann. */ + #include <sys/types.h> + #if HAVE_UNISTD_H + # include <unistd.h> + #endif + /* Some systems only have a dummy stub for fork() */ + int main () + { + if (fork() < 0) + exit (1); + exit (0); + } _ACEOF rm -f conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5