summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-13 09:15:16 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-15 22:38:10 -0700
commite1f495359a74342352c4d6641c0002c7c79327ba (patch)
tree74df96123dc50b0b4d94c7901ceb7d6e5ff9d223
parent800f55f8dcd195dd0cdfc1c4d7487d00bb7745f4 (diff)
Merge overlapping AC_CHECK_HEADERS & AC_CHECK_FUNCS calls into one set
Duplication introduced when merging in changes in commit fddfe30c3ff91c Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-rw-r--r--configure.ac5
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 0ec4664..1c6f2c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,9 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h])
-AC_CHECK_FUNCS([select grantpt posix_openpt])
-
AC_ARG_WITH(localealiasfile,
AS_HELP_STRING([--with-localealiasfile=<path>],
[The locale alias file (default: ${datadir}/X11/locale/locale.alias)]),
@@ -67,7 +64,7 @@ case $host_os in
esac
AC_CHECK_HEADERS([pty.h stropts.h sys/ioctl.h sys/param.h sys/poll.h sys/select.h sys/time.h termios.h])
-AC_CHECK_FUNCS([grantpt putenv select strdup])
+AC_CHECK_FUNCS([grantpt posix_openpt putenv select strdup])
if test "x$ac_cv_func_grantpt" != "xyes" ; then
AC_CHECK_LIB(util, openpty, [cf_have_openpty=yes],[cf_have_openpty=no])