Make 'configure' a bit smaller and faster.

* configure.in (INSTALL_INFO): Set it with one call to
AC_PATH_PROG, not three.
(PKG_CONFIG): Hoist this out of PKG_CHECK_MODULES, since it's
so likely that it'll be needed.
(AC_CHECK_HEADERS_ONCE): Prefer to AC_CHECK_HEADERS where either works.
(AC_PROG_MAKE_SET): Remove; Automake does this.
(sysinfo): Do not check for this function, as it's never used.
(tzset): Check for this function just once.
* admin/CPP-DEFINES: Remove HAVE_SYSINFO.
* m4/manywarnings.m4: Sync from gnulib, incorporating the following:
2012-05-27 manywarnings: remove duplicate -Wmultichar entry

diff --git a/ChangeLog b/ChangeLog
index 2419353f74a0b9df9fc2256882df87065aba9da7..ef790cd8d30fb32eaa7c460eae5daaf495999abf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,25 @@
+2012-05-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Make 'configure' a bit smaller and faster.
+       * configure.in (INSTALL_INFO): Set it with one call to
+       AC_PATH_PROG, not three.
+       (PKG_CONFIG): Hoist this out of PKG_CHECK_MODULES, since it's
+       so likely that it'll be needed.
+       (AC_CHECK_HEADERS_ONCE): Prefer to AC_CHECK_HEADERS where either works.
+       (AC_PROG_MAKE_SET): Remove; Automake does this.
+       (sysinfo): Do not check for this function, as it's never used.
+       (tzset): Check for this function just once.
+       * m4/manywarnings.m4: Sync from gnulib, incorporating the following:
+       2012-05-27 manywarnings: remove duplicate -Wmultichar entry
+
 2012-05-27  Eli Zaretskii  <eliz@gnu.org>
 
        * config.bat (lib): Create/update lib/stdalign.in-h and
        lib/sys_types.in-h.
 
-       * lib/makefile.w32-in ($(BLD)/md5.$(O)): 
-       ($(BLD)/sha1.$(O)): 
-       ($(BLD)/sha256.$(O)): 
+       * lib/makefile.w32-in ($(BLD)/md5.$(O)):
+       ($(BLD)/sha1.$(O)):
+       ($(BLD)/sha256.$(O)):
        ($(BLD)/sha512.$(O)): Depend on $(EMACS_ROOT)/nt/inc/stdalign.h.
        Suggested by Christoph Scholtes <cschol2112@googlemail.com>.
 

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index c03bf6156ab851db6cfe094a01769433562ac3c3..94bb94357b9bdcfd6af74cd72231a1d86ceb0571 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -156,7 +156,6 @@ HAVE_STRERROR
 HAVE_STRFTIME
 HAVE_STRING_H
 HAVE_STRUCT_UTIMBUF
-HAVE_SYSINFO
 HAVE_SYSV_SIGPAUSE
 HAVE_SYS_SELECT_H
 HAVE_SYS_SYSTEMINFO_H

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f278206494b5506bb9938ce7abb1200e917a38c2..0c3bbf93873245e9a66bdf92752f1c789188211d 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * CPP-DEFINES: Remove HAVE_SYSINFO.
+
 2012-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        Assume gnulib does largefile.

diff --git a/configure.in b/configure.in
index 15cc35f628956bf78db732b5d29088a4da029957..9b805bf9a5fbfb5f2996d4e38a624ac6041d1e1f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -708,9 +708,8 @@ dnl if test "x$RANLIB" = x; then
 dnl   AC_PROG_RANLIB
 dnl fi
 
-AC_PATH_PROG(INSTALL_INFO, install-info)
-AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin)
-AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
+AC_PATH_PROG(INSTALL_INFO, install-info, :,
+  $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
 dnl Don't use GZIP, which is used by gzip for additional parameters.
 AC_PATH_PROG(GZIP_PROG, gzip)
 
@@ -1067,6 +1066,8 @@ case $opsys in
 esac
 
 
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
 dnl This function definition taken from Gnome 2.0
 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
@@ -1074,8 +1075,6 @@ dnl also defines GSTUFF_PKG_ERRORS on error
 AC_DEFUN([PKG_CHECK_MODULES], [
   succeeded=no
 
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
   if test "$PKG_CONFIG" = "no" ; then
      ifelse([$4], , [AC_MSG_ERROR([
       *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog.  Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config.])], [$4])
@@ -1176,10 +1175,11 @@ if test "${with_sound}" != "no"; then
 fi
 
 dnl checks for header files
-AC_CHECK_HEADERS(sys/select.h sys/time.h unistd.h utime.h \
-  linux/version.h sys/systeminfo.h \
-  stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \
-  sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
+AC_CHECK_HEADERS_ONCE(
+  sys/select.h sys/time.h utime.h
+  linux/version.h sys/systeminfo.h
+  stdio_ext.h fcntl.h coff.h pty.h
+  sys/vlimit.h sys/resource.h
   sys/utsname.h pwd.h utmp.h dirent.h util.h)
 
 AC_MSG_CHECKING(if personality LINUX32 can be set)
@@ -1263,7 +1263,7 @@ if test $emacs_cv_struct_exception != yes; then
   AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in math.h.])
 fi
 
-AC_CHECK_HEADERS(sys/socket.h)
+AC_CHECK_HEADERS_ONCE(sys/socket.h)
 AC_CHECK_HEADERS(net/if.h, , , [AC_INCLUDES_DEFAULT
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -1292,7 +1292,7 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
 #endif])
 
 dnl Check for endianness.
-AC_C_BIGENDIAN
+dnl AC_C_BIGENDIAN is done by gnulib.
 
 AC_CACHE_CHECK([for  __attribute__ ((__aligned__ (expr)))],
   [emacs_cv_attribute_aligned],
@@ -1308,7 +1308,7 @@ if test $emacs_cv_attribute_aligned = yes; then
 fi
 
 dnl check for Make feature
-AC_PROG_MAKE_SET
+dnl AC_PROG_MAKE_SET is done by Automake.
 
 DEPFLAGS=
 MKDEPDIR=":"
@@ -1664,7 +1664,7 @@ AC_CHECK_LIB(Xbsd, main, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
 
 dnl Check if pthreads is available.
 LIB_PTHREAD=
-AC_CHECK_HEADERS(pthread.h)
+AC_CHECK_HEADERS_ONCE(pthread.h)
 if test "$ac_cv_header_pthread_h"; then
   dnl gmalloc.c uses pthread_atfork, which is not available on older-style
   dnl hosts such as MirBSD 10, so test for pthread_atfork instead of merely
@@ -2537,7 +2537,7 @@ fi
 AC_SUBST(LIBGPM)
 
 dnl Check for malloc/malloc.h on darwin
-AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])])
+AC_CHECK_HEADERS_ONCE(malloc/malloc.h)
 
 GNUSTEP_CFLAGS=
 ### Use NeXTstep API to implement GUI.
@@ -2642,7 +2642,7 @@ There may be a `development' package to install containing liblockfile.])
   fi
 fi
 AC_CHECK_FUNCS(touchlock)
-AC_CHECK_HEADERS(maillock.h)
+AC_CHECK_HEADERS_ONCE(maillock.h)
 AC_SUBST(LIBS_MAIL)
 
 ## Define MAIL_USE_FLOCK (or LOCKF) if the mailer uses flock (or lockf) to
@@ -2688,9 +2688,9 @@ AC_SUBST(BLESSMAIL_TARGET)
 
 
 AC_CHECK_FUNCS(gethostname \
-rename closedir mkdir rmdir sysinfo getrusage get_current_dir_name \
+rename closedir mkdir rmdir getrusage get_current_dir_name \
 random lrand48 logb frexp fmod rint cbrt setsid \
-strerror fpathconf select euidaccess getpagesize tzset setlocale \
+strerror fpathconf select euidaccess getpagesize setlocale \
 utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \
 __fpending strsignal setitimer \
 sendto recvfrom getsockname getpeername \
@@ -2710,7 +2710,7 @@ if test $emacs_cv_func___builtin_unwind_init = yes; then
            [Define to 1 if you have the `__builtin_unwind_init' function.])
 fi
 
-AC_CHECK_HEADERS(sys/un.h)
+AC_CHECK_HEADERS_ONCE(sys/un.h)
 
 AC_FUNC_FSEEKO
 
@@ -2977,6 +2977,7 @@ AC_SUBST(KRB5LIB)
 AC_SUBST(DESLIB)
 AC_SUBST(KRB4LIB)
 
+AC_CHECK_FUNCS_ONCE(tzset)
 AC_MSG_CHECKING(whether localtime caches TZ)
 AC_CACHE_VAL(emacs_cv_localtime_cache,
 [if test x$ac_cv_func_tzset = xyes; then

diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index fd0e3722d353850063c4787d080da2c240b43afc..864fc851982153d719fe4355912335f40dd5d5c8 100644 (file)
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -1,4 +1,4 @@
-# manywarnings.m4 serial 3
+# manywarnings.m4 serial 4
 dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
   for gl_manywarn_item in \
     -Wattributes \
     -Wcoverage-mismatch \
-    -Wmultichar \
     -Wunused-macros \
     ; do
     gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"