aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in16
2 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 4685fc0a25..5f19b1cba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-12 Paul Eggert <[email protected]>
+
+ * configure.in: Coalesce some function checking.
+ This makes 'configure' a bit smaller.
+ Prefer AC_CHECK_FUNCS_ONCE for functions that we always check for.
+
2012-06-12 Glenn Morris <[email protected]>
* configure.in: Anticipate platforms with no src/s file.
diff --git a/configure.in b/configure.in
index 6e55ea0658..3ba3e18457 100644
--- a/configure.in
+++ b/configure.in
@@ -1279,7 +1279,6 @@ AC_CHECK_HEADERS(net/if_dl.h, , , [AC_INCLUDES_DEFAULT
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif])
-AC_CHECK_FUNCS(getifaddrs freeifaddrs)
dnl checks for structure members
AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr,
@@ -1854,8 +1853,7 @@ if test "${HAVE_X11}" = "yes"; then
AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.])
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
LIBS="$IMAGEMAGICK_LIBS $LIBS"
- AC_CHECK_FUNCS(MagickExportImagePixels)
- AC_CHECK_FUNCS(MagickMergeImageLayers)
+ AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers)
fi
fi
fi
@@ -2647,7 +2645,6 @@ This probably means that movemail could lose mail.
There may be a `development' package to install containing liblockfile.])
fi
fi
-AC_CHECK_FUNCS(touchlock)
AC_CHECK_HEADERS_ONCE(maillock.h)
AC_SUBST(LIBS_MAIL)
@@ -2693,16 +2690,17 @@ esac
AC_SUBST(BLESSMAIL_TARGET)
-AC_CHECK_FUNCS(gethostname \
+AC_CHECK_FUNCS_ONCE(gethostname \
rename closedir mkdir rmdir getrusage get_current_dir_name \
random lrand48 logb frexp fmod rint cbrt setsid \
strerror fpathconf select euidaccess getpagesize setlocale \
utimes getrlimit setrlimit setpgid getcwd getwd shutdown getaddrinfo \
__fpending strsignal setitimer \
-sendto recvfrom getsockname getpeername \
+sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
gai_strerror mkstemp getline getdelim fsync sync \
difftime posix_memalign \
getpwent endpwent getgrent endgrent \
+touchlock \
cfmakeraw cfsetspeed copysign __executable_start)
dnl Cannot use AC_CHECK_FUNCS
@@ -2723,10 +2721,10 @@ AC_FUNC_FSEEKO
AC_FUNC_GETPGRP
# UNIX98 PTYs.
-AC_CHECK_FUNCS(grantpt)
+AC_CHECK_FUNCS_ONCE(grantpt)
# PTY-related GNU extensions.
-AC_CHECK_FUNCS(getpt)
+AC_CHECK_FUNCS_ONCE(getpt)
# Check this now, so that we will NOT find the above functions in ncurses.
# That is because we have not set up to link ncurses in lib-src.
@@ -3077,7 +3075,7 @@ fi
AC_FUNC_FORK
-AC_CHECK_FUNCS(snprintf)
+AC_CHECK_FUNCS_ONCE(snprintf)
dnl Adapted from Haible's version.
AC_CACHE_CHECK([for nl_langinfo and CODESET], emacs_cv_langinfo_codeset,