summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-12-06 00:07:55 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-12-06 00:07:55 +0000
commit32f1ceddc9d2e58655daf42e952989eb8561c8a3 (patch)
tree31cf402ccacd05b4632e0d0e3d75e4b782c68697 /configure.ac
parentbd803e82e96512473036461ec3832c569768e535 (diff)
Tweak ordering and whitespace.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac88
1 files changed, 44 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac
index fc71f02a..d43920e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,28 +23,6 @@ AC_PROG_INSTALL
# Default tmux.conf goes in /etc not ${prefix}/etc.
test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
-# Check for various headers. Alternatives included from compat.h.
-AC_CHECK_HEADERS(
- [ \
- bitstring.h \
- curses.h \
- dirent.h \
- fcntl.h \
- inttypes.h \
- libutil.h \
- ncurses.h \
- ndir.h \
- paths.h \
- pty.h \
- stdint.h \
- sys/dir.h \
- sys/ndir.h \
- sys/tree.h \
- term.h \
- util.h \
- ]
-)
-
# Is this a debug build?
found_debug=yes
AC_ARG_ENABLE(
@@ -56,12 +34,12 @@ AM_CONDITIONAL(IS_DEBUG, test "x$found_debug" = xyes)
# Is this a static build?
AC_ARG_ENABLE(
- static,
- AC_HELP_STRING(--enable-static, create a static build),
- found_static=$enable_static
+ static,
+ AC_HELP_STRING(--enable-static, create a static build),
+ found_static=$enable_static
)
if test "x$found_static" = xyes; then
- LDFLAGS="$LDFLAGS -static"
+ LDFLAGS="$LDFLAGS -static"
fi
# Is this gcc?
@@ -109,6 +87,40 @@ AC_EGREP_CPP(
AM_CONDITIONAL(IS_GLIBC, test "x$found_glibc" = xyes)
AC_MSG_RESULT($found_glibc)
+# Check for various headers. Alternatives included from compat.h.
+AC_CHECK_HEADERS(
+ [ \
+ bitstring.h \
+ curses.h \
+ dirent.h \
+ fcntl.h \
+ inttypes.h \
+ libutil.h \
+ ncurses.h \
+ ndir.h \
+ paths.h \
+ pty.h \
+ stdint.h \
+ sys/dir.h \
+ sys/ndir.h \
+ sys/tree.h \
+ term.h \
+ util.h \
+ ]
+)
+
+# Check for some functions that are replaced or omitted.
+AC_CHECK_FUNCS(
+ [ \
+ bzero \
+ dirfd \
+ flock \
+ setproctitle \
+ sysconf \
+ cfmakeraw \
+ ]
+)
+
# Look for clock_gettime. Must come before event_init.
AC_SEARCH_LIBS(clock_gettime, rt)
@@ -142,14 +154,14 @@ AC_SEARCH_LIBS(
found_curses=no
)
if test "x$found_curses" = xno; then
- AC_MSG_ERROR("curses not found")
+ AC_MSG_ERROR("curses not found")
fi
# Look for utempter.
AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
if test "x$have_utempter" = xyes; then
- AC_DEFINE(HAVE_UTEMPTER)
- LIBS="$LIBS -lutempter"
+ AC_DEFINE(HAVE_UTEMPTER)
+ LIBS="$LIBS -lutempter"
fi
# Check for b64_ntop.
@@ -229,7 +241,7 @@ if test "x$found_cmsg_data" = xno; then
if test "x$found_cmsg_data" = xyes; then
XOPEN_DEFINES="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED"
else
- AC_MSG_ERROR("CMSG_DATA not found")
+ AC_MSG_ERROR("CMSG_DATA not found")
fi
fi
AC_SUBST(XOPEN_DEFINES)
@@ -381,18 +393,6 @@ if test "x$found_getopt" != xno; then
fi
AM_CONDITIONAL(NO_GETOPT, [test "x$found_getopt" = xno])
-# Check for some functions that are replaced or omitted.
-AC_CHECK_FUNCS(
- [ \
- bzero \
- dirfd \
- flock \
- setproctitle \
- sysconf \
- cfmakeraw \
- ]
-)
-
# Check for BSD-style integer types.
AC_MSG_CHECKING(for BSD-style unsigned types)
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
@@ -405,7 +405,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
#endif
int main(void)
{ u_int8_t u8; u_int16_t u16; u_int32_t u32; u_int64_t u64; }
- ])],
+ ])],
[AC_DEFINE(HAVE_BSD_TYPES) AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no)
)
@@ -439,7 +439,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE(
printf("%s\n", cp);
exit(0);
}
- ])],
+ ])],
[AC_DEFINE(HAVE___PROGNAME) AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no)
)