diff configure.in @ 83550:17e0dd217877

Merged from [e-mail]. Patches applied: * [e-mail]/emacs--devo--0--patch-536 Update from CVS * [e-mail]/emacs--devo--0--patch-537 Update from CVS * [e-mail]/emacs--devo--0--patch-538 Update from CVS * [e-mail]/emacs--devo--0--patch-539 Update from CVS * [e-mail]/emacs--devo--0--patch-540 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-541 Update from CVS * [e-mail]/emacs--devo--0--patch-542 Update from CVS * [e-mail]/emacs--devo--0--patch-543 Update from CVS * [e-mail]/emacs--devo--0--patch-544 Update from CVS * [e-mail]/emacs--devo--0--patch-545 Update from CVS * [e-mail]/emacs--devo--0--patch-546 Update from erc--emacs--22 * [e-mail]/emacs--devo--0--patch-547 Update from CVS * [e-mail]/emacs--devo--0--patch-548 Update from CVS * [e-mail]/emacs--devo--0--patch-549 Update from CVS * [e-mail]/emacs--devo--0--patch-550 Update from CVS * [e-mail]/emacs--devo--0--patch-551 Update from CVS * [e-mail]/emacs--devo--0--patch-552 Update from CVS * [e-mail]/emacs--devo--0--patch-553 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-554 Update from CVS * [e-mail]/emacs--devo--0--patch-555 erc-iswitchb: Temporarily enable iswitchb mode * [e-mail]/emacs--devo--0--patch-556 Update from CVS * [e-mail]/emacs--devo--0--patch-557 Update from CVS * [e-mail]/emacs--devo--0--patch-558 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-559 Update from CVS * [e-mail]/emacs--devo--0--patch-560 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-561 Update from CVS * [e-mail]/emacs--devo--0--patch-562 Update from CVS * [e-mail]/emacs--devo--0--patch-563 Update from CVS * [e-mail]/emacs--devo--0--patch-564 Update from CVS * [e-mail]/emacs--devo--0--patch-565 Update from CVS * [e-mail]/emacs--devo--0--patch-566 Update from CVS * [e-mail]/emacs--devo--0--patch-567 Update from CVS * [e-mail]/emacs--devo--0--patch-568 Update from CVS * [e-mail]/emacs--devo--0--patch-569 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-570 Update from CVS * [e-mail]/emacs--devo--0--patch-571 Update from CVS * [e-mail]/emacs--devo--0--patch-572 Update from CVS * [e-mail]/emacs--devo--0--patch-573 Update from CVS * [e-mail]/emacs--devo--0--patch-574 Update from CVS * [e-mail]/emacs--devo--0--patch-575 Update from CVS * [e-mail]/emacs--devo--0--patch-576 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-577 Update from CVS * [e-mail]/emacs--devo--0--patch-578 Update from CVS * [e-mail]/emacs--devo--0--patch-579 Update from CVS * [e-mail]/emacs--devo--0--patch-580 Update from CVS * [e-mail]/emacs--devo--0--patch-581 Update from CVS * [e-mail]/emacs--devo--0--patch-582 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-583 Update from CVS * [e-mail]/emacs--devo--0--patch-584 Fix admin/quick-install-emacs to work with recent versions of autoconf * [e-mail]/gnus--rel--5.10--patch-171 Update from CVS * [e-mail]/gnus--rel--5.10--patch-172 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-173 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-174 Update from CVS * [e-mail]/gnus--rel--5.10--patch-175 Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice. * [e-mail]/gnus--rel--5.10--patch-176 Update from CVS * [e-mail]/gnus--rel--5.10--patch-177 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-178 Update from CVS * [e-mail]/gnus--rel--5.10--patch-179 Update from CVS * [e-mail]/gnus--rel--5.10--patch-180 Update from CVS * [e-mail]/gnus--rel--5.10--patch-181 Update from CVS * [e-mail]/gnus--rel--5.10--patch-182 Update from CVS * [e-mail]/gnus--rel--5.10--patch-183 Update from CVS * [e-mail]/gnus--rel--5.10--patch-184 Update from CVS * [e-mail]/gnus--rel--5.10--patch-185 Merge from emacs--devo--0 git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-590

--- a/configure.in	Sun Dec 03 15:12:18 2006 +0000
+++ b/configure.in	Mon Jan 01 17:38:32 2007 +0000
@@ -23,7 +23,7 @@
 dnl  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 dnl  Boston, MA 02110-1301, USA.
 
-AC_PREREQ(2.54)dnl
+AC_PREREQ(2.61)dnl
 AC_INIT(src/lisp.h)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 
@@ -260,7 +260,6 @@
       m68k-*-netbsd*)
 			# This is somewhat bogus.
 			machine=hp9000s300 ;;
-      powerpc-apple-netbsd*) machine=macppc ;;
       mips-*-netbsd*)	machine=pmax ;;
       mipsel-*-netbsd*)	machine=pmax ;;
       mipseb-*-netbsd*)	machine=pmax ;;
@@ -269,6 +268,9 @@
       sparc*-*-netbsd*)	machine=sparc ;;
       vax-*-netbsd*)	machine=vax ;;
       arm-*-netbsd*)	machine=arm ;;
+      x86_64-*-netbsd*)	machine=amdx86-64 ;;
+      hppa-*-netbsd*)	machine=hp800 ;;
+      shle-*-netbsd*)	machine=sh3el ;;
     esac
   ;;
 
@@ -951,6 +953,7 @@
       m68* )		machine=sun3 ;;
       i[3456]86-sun-sunos[34]* )	machine=sun386 ;;
       i[3456]86-*-* )     machine=intel386 ;;
+      amd64-*-*|x86_64-*-*)	machine=amdx86-64 ;;
       powerpcle* )      machine=powerpcle ;;
       powerpc* | rs6000* )  machine=ibmrs6000 ;;
       sparc* )		machine=sparc ;;
@@ -1566,9 +1569,30 @@
   fi
   PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
   if test $HAVE_ALSA = yes; then
+    SAVE_CFLAGS="$CFLAGS"
+    SAVE_LDFLAGS="$LDFLAGS"
+    CFLAGS="$ALSA_CFLAGS $CFLAGS"
+    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+    AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
+                    emacs_alsa_normal=yes,
+	            emacs_alsa_normal=no)
+    if test "$emacs_alsa_normal" != yes; then
+      AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
+                     [snd_lib_error_set_handler (0);],
+                     emacs_alsa_subdir=yes,
+	             emacs_alsa_subdir=no)
+      if test "$emacs_alsa_subdir" != yes; then
+        AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
+      fi
+      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
+    fi
+
+    CFLAGS="$SAVE_CFLAGS"
+    LDFLAGS="$SAVE_LDFLAGS"
     LIBSOUND="$LIBSOUND $ALSA_LIBS"
     CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
     AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
+    AC_SUBST()
   fi
   AC_SUBST(CFLAGS_SOUND)
 fi
@@ -2042,6 +2066,9 @@
 fi
 
 HAVE_GTK=no
+if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
+  USE_X_TOOLKIT=none
+fi
 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
   if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
     AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
@@ -2061,6 +2088,13 @@
   C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
   CFLAGS="$CFLAGS $GTK_CFLAGS"
   LIBS="$GTK_LIBS $LIBS"
+  dnl Try to compile a simple GTK program.
+  GTK_COMPILES=no
+  AC_CHECK_FUNCS(gtk_main, GTK_COMPILES=yes)
+  if test "${GTK_COMPILES}" != "yes"; then
+    AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?]);
+  fi
+  
   HAVE_GTK=yes
   AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.])
   USE_X_TOOLKIT=none
@@ -2492,7 +2526,7 @@
 utimes setrlimit setpgid getcwd getwd shutdown getaddrinfo \
 __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \
 sendto recvfrom getsockopt setsockopt getsockname getpeername \
-gai_strerror mkstemp getline getdelim mremap memmove fsync bzero \
+gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \
 memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign)
 
 AC_CHECK_HEADERS(sys/un.h)
@@ -2653,38 +2687,6 @@
   fi
 fi
 
-# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
-AC_STRUCT_TIMEZONE
-
-dnl Note that AC_STRUCT_TIMEZONE doesn't do what you might expect.
-if test "$ac_cv_func_gettimeofday" = yes; then
-  AC_CACHE_CHECK([for struct timezone], emacs_cv_struct_timezone,
-    [AC_TRY_COMPILE([#include <sys/time.h>],
-    [struct timezone tz;],
-    dnl It may be that we can't call gettimeofday with a non-null pointer,
-    dnl even though we have struct timezone (e.g. HPUX).  In that case
-    dnl we'll lie about struct timezone.
-    [AC_TRY_RUN([
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-main () {
-  struct timeval time;
-  struct timezone dummy;
-  exit (gettimeofday (&time, &dummy));
-}],
-      emacs_cv_struct_timezone=yes,
-      emacs_cv_struct_timezone=no, emacs_cv_struct_timezone=yes)],
-    emacs_cv_struct_timezone=no)])
-fi
-
 ok_so_far=yes
 AC_CHECK_FUNC(socket, , ok_so_far=no)
 if test $ok_so_far = yes; then
@@ -2877,7 +2879,7 @@
 fi
 
 AH_TOP([/* GNU Emacs site configuration template file.
-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2004, 2005, 2006
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006
              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.