Mercurial > emacs

comparison configure.in @ 83550:17e0dd217877

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-536 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-537 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-538 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-539 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-540 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-541 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-542 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-543 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-544 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-545 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-546 Update from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-547 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-548 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-549 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-550 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-551 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-552 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-553 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-554 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-555 erc-iswitchb: Temporarily enable iswitchb mode * emacs@sv.gnu.org/emacs--devo--0--patch-556 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-557 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-558 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-559 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-560 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-561 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-562 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-563 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-564 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-565 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-566 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-567 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-568 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-569 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-570 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-571 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-572 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-573 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-574 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-575 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-576 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-577 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-578 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-579 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-580 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-581 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-582 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-583 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-584 Fix admin/quick-install-emacs to work with recent versions of autoconf * emacs@sv.gnu.org/gnus--rel--5.10--patch-171 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-172 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-173 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-174 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-175 Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. * emacs@sv.gnu.org/gnus--rel--5.10--patch-176 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-177 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-178 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-179 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-180 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-181 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-182 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-183 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-184 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-185 Merge from emacs--devo--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-590
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 01 Jan 2007 17:38:32 +0000
parents c71725faff1a 86540ee6f1e4
children d3099204c799
comparison
equal deleted inserted replaced
83549:8d80de0a1ac6 83550:17e0dd217877
21 dnl You should have received a copy of the GNU General Public License 21 dnl You should have received a copy of the GNU General Public License
22 dnl along with GNU Emacs; see the file COPYING. If not, write to the 22 dnl along with GNU Emacs; see the file COPYING. If not, write to the
23 dnl Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 23 dnl Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 dnl Boston, MA 02110-1301, USA. 24 dnl Boston, MA 02110-1301, USA.
25 25
26 AC_PREREQ(2.54)dnl 26 AC_PREREQ(2.61)dnl
27 AC_INIT(src/lisp.h) 27 AC_INIT(src/lisp.h)
28 AC_CONFIG_HEADER(src/config.h:src/config.in) 28 AC_CONFIG_HEADER(src/config.h:src/config.in)
29 29
30 dnl Support for --program-prefix, --program-suffix and 30 dnl Support for --program-prefix, --program-suffix and
31 dnl --program-transform-name options 31 dnl --program-transform-name options
258 alpha*-*-netbsd*) machine=alpha ;; 258 alpha*-*-netbsd*) machine=alpha ;;
259 i[3456]86-*-netbsd*) machine=intel386 ;; 259 i[3456]86-*-netbsd*) machine=intel386 ;;
260 m68k-*-netbsd*) 260 m68k-*-netbsd*)
261 # This is somewhat bogus. 261 # This is somewhat bogus.
262 machine=hp9000s300 ;; 262 machine=hp9000s300 ;;
263 powerpc-apple-netbsd*) machine=macppc ;;
264 mips-*-netbsd*) machine=pmax ;; 263 mips-*-netbsd*) machine=pmax ;;
265 mipsel-*-netbsd*) machine=pmax ;; 264 mipsel-*-netbsd*) machine=pmax ;;
266 mipseb-*-netbsd*) machine=pmax ;; 265 mipseb-*-netbsd*) machine=pmax ;;
267 ns32k-*-netbsd*) machine=ns32000 ;; 266 ns32k-*-netbsd*) machine=ns32000 ;;
268 powerpc-*-netbsd*) machine=macppc ;; 267 powerpc-*-netbsd*) machine=macppc ;;
269 sparc*-*-netbsd*) machine=sparc ;; 268 sparc*-*-netbsd*) machine=sparc ;;
270 vax-*-netbsd*) machine=vax ;; 269 vax-*-netbsd*) machine=vax ;;
271 arm-*-netbsd*) machine=arm ;; 270 arm-*-netbsd*) machine=arm ;;
271 x86_64-*-netbsd*) machine=amdx86-64 ;;
272 hppa-*-netbsd*) machine=hp800 ;;
273 shle-*-netbsd*) machine=sh3el ;;
272 esac 274 esac
273 ;; 275 ;;
274 276
275 ## OpenBSD ports 277 ## OpenBSD ports
276 *-*-openbsd* ) 278 *-*-openbsd* )
949 m68*-sunos1* ) machine=sun1 ;; 951 m68*-sunos1* ) machine=sun1 ;;
950 m68*-sunos2* ) machine=sun2 ;; 952 m68*-sunos2* ) machine=sun2 ;;
951 m68* ) machine=sun3 ;; 953 m68* ) machine=sun3 ;;
952 i[3456]86-sun-sunos[34]* ) machine=sun386 ;; 954 i[3456]86-sun-sunos[34]* ) machine=sun386 ;;
953 i[3456]86-*-* ) machine=intel386 ;; 955 i[3456]86-*-* ) machine=intel386 ;;
956 amd64-*-*|x86_64-*-*) machine=amdx86-64 ;;
954 powerpcle* ) machine=powerpcle ;; 957 powerpcle* ) machine=powerpcle ;;
955 powerpc* | rs6000* ) machine=ibmrs6000 ;; 958 powerpc* | rs6000* ) machine=ibmrs6000 ;;
956 sparc* ) machine=sparc ;; 959 sparc* ) machine=sparc ;;
957 * ) unported=yes ;; 960 * ) unported=yes ;;
958 esac 961 esac
1564 if test "X${with_pkg_config_prog}" != X; then 1567 if test "X${with_pkg_config_prog}" != X; then
1565 PKG_CONFIG="${with_pkg_config_prog}" 1568 PKG_CONFIG="${with_pkg_config_prog}"
1566 fi 1569 fi
1567 PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no) 1570 PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
1568 if test $HAVE_ALSA = yes; then 1571 if test $HAVE_ALSA = yes; then
1572 SAVE_CFLAGS="$CFLAGS"
1573 SAVE_LDFLAGS="$LDFLAGS"
1574 CFLAGS="$ALSA_CFLAGS $CFLAGS"
1575 LDFLAGS="$ALSA_LIBS $LDFLAGS"
1576 AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
1577 emacs_alsa_normal=yes,
1578 emacs_alsa_normal=no)
1579 if test "$emacs_alsa_normal" != yes; then
1580 AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
1581 [snd_lib_error_set_handler (0);],
1582 emacs_alsa_subdir=yes,
1583 emacs_alsa_subdir=no)
1584 if test "$emacs_alsa_subdir" != yes; then
1585 AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.])
1586 fi
1587 ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
1588 fi
1589
1590 CFLAGS="$SAVE_CFLAGS"
1591 LDFLAGS="$SAVE_LDFLAGS"
1569 LIBSOUND="$LIBSOUND $ALSA_LIBS" 1592 LIBSOUND="$LIBSOUND $ALSA_LIBS"
1570 CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" 1593 CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
1571 AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.]) 1594 AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
1595 AC_SUBST()
1572 fi 1596 fi
1573 AC_SUBST(CFLAGS_SOUND) 1597 AC_SUBST(CFLAGS_SOUND)
1574 fi 1598 fi
1575 1599
1576 dnl checks for header files 1600 dnl checks for header files
2040 AC_MSG_RESULT(before 5) 2064 AC_MSG_RESULT(before 5)
2041 fi 2065 fi
2042 fi 2066 fi
2043 2067
2044 HAVE_GTK=no 2068 HAVE_GTK=no
2069 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
2070 USE_X_TOOLKIT=none
2071 fi
2045 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then 2072 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
2046 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then 2073 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
2047 AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); 2074 AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
2048 fi 2075 fi
2049 GLIB_REQUIRED=2.4 2076 GLIB_REQUIRED=2.4
2059 AC_SUBST(GTK_CFLAGS) 2086 AC_SUBST(GTK_CFLAGS)
2060 AC_SUBST(GTK_LIBS) 2087 AC_SUBST(GTK_LIBS)
2061 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS" 2088 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
2062 CFLAGS="$CFLAGS $GTK_CFLAGS" 2089 CFLAGS="$CFLAGS $GTK_CFLAGS"
2063 LIBS="$GTK_LIBS $LIBS" 2090 LIBS="$GTK_LIBS $LIBS"
2091 dnl Try to compile a simple GTK program.
2092 GTK_COMPILES=no
2093 AC_CHECK_FUNCS(gtk_main, GTK_COMPILES=yes)
2094 if test "${GTK_COMPILES}" != "yes"; then
2095 AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?]);
2096 fi
2097
2064 HAVE_GTK=yes 2098 HAVE_GTK=yes
2065 AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.]) 2099 AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.])
2066 USE_X_TOOLKIT=none 2100 USE_X_TOOLKIT=none
2067 2101
2068 dnl GTK scrollbars resemble toolkit scrollbars a lot, so to avoid 2102 dnl GTK scrollbars resemble toolkit scrollbars a lot, so to avoid
2490 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \ 2524 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
2491 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ 2525 strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \
2492 utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \ 2526 utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \
2493 __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \ 2527 __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \
2494 sendto recvfrom getsockopt setsockopt getsockname getpeername \ 2528 sendto recvfrom getsockopt setsockopt getsockname getpeername \
2495 gai_strerror mkstemp getline getdelim mremap memmove fsync bzero \ 2529 gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \
2496 memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign) 2530 memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign)
2497 2531
2498 AC_CHECK_HEADERS(sys/un.h) 2532 AC_CHECK_HEADERS(sys/un.h)
2499 2533
2500 AC_FUNC_MKTIME 2534 AC_FUNC_MKTIME
2651 [Define to 1 if gettimeofday accepts only one argument.]) 2685 [Define to 1 if gettimeofday accepts only one argument.])
2652 fi 2686 fi
2653 fi 2687 fi
2654 fi 2688 fi
2655 2689
2656 # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
2657 AC_STRUCT_TIMEZONE
2658
2659 dnl Note that AC_STRUCT_TIMEZONE doesn't do what you might expect.
2660 if test "$ac_cv_func_gettimeofday" = yes; then
2661 AC_CACHE_CHECK([for struct timezone], emacs_cv_struct_timezone,
2662 [AC_TRY_COMPILE([#include <sys/time.h>],
2663 [struct timezone tz;],
2664 dnl It may be that we can't call gettimeofday with a non-null pointer,
2665 dnl even though we have struct timezone (e.g. HPUX). In that case
2666 dnl we'll lie about struct timezone.
2667 [AC_TRY_RUN([
2668 #ifdef TIME_WITH_SYS_TIME
2669 #include <sys/time.h>
2670 #include <time.h>
2671 #else
2672 #ifdef HAVE_SYS_TIME_H
2673 #include <sys/time.h>
2674 #else
2675 #include <time.h>
2676 #endif
2677 #endif
2678 main () {
2679 struct timeval time;
2680 struct timezone dummy;
2681 exit (gettimeofday (&time, &dummy));
2682 }],
2683 emacs_cv_struct_timezone=yes,
2684 emacs_cv_struct_timezone=no, emacs_cv_struct_timezone=yes)],
2685 emacs_cv_struct_timezone=no)])
2686 fi
2687
2688 ok_so_far=yes 2690 ok_so_far=yes
2689 AC_CHECK_FUNC(socket, , ok_so_far=no) 2691 AC_CHECK_FUNC(socket, , ok_so_far=no)
2690 if test $ok_so_far = yes; then 2692 if test $ok_so_far = yes; then
2691 AC_CHECK_HEADER(netinet/in.h, , ok_so_far=no) 2693 AC_CHECK_HEADER(netinet/in.h, , ok_so_far=no)
2692 fi 2694 fi
2875 [Define REL_ALLOC if you want to use the relocating allocator for 2877 [Define REL_ALLOC if you want to use the relocating allocator for
2876 buffer space.]) 2878 buffer space.])
2877 fi 2879 fi
2878 2880
2879 AH_TOP([/* GNU Emacs site configuration template file. 2881 AH_TOP([/* GNU Emacs site configuration template file.
2880 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 2006 2882 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006
2881 Free Software Foundation, Inc. 2883 Free Software Foundation, Inc.
2882 2884
2883 This file is part of GNU Emacs. 2885 This file is part of GNU Emacs.
2884 2886
2885 GNU Emacs is free software; you can redistribute it and/or modify 2887 GNU Emacs is free software; you can redistribute it and/or modify