circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 21:56:57 +00:00
Code Issues Projects Releases Wiki Activity

Can use enable_* rather than adding our own found_* variables, from Dilyan Palauzov.

Browse Source
This commit is contained in:
Nicholas Marriott
2016-10-17 19:09:38 +01:00
parent d54e990c4f
commit 733185d0a9
1 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
configure.ac
View File

@ -24,37 +24,33 @@ PKG_PROG_PKG_CONFIG
test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
# Is this --enable-debug? # Is this --enable-debug?
found_debug=yes enable_debug=yes
AC_ARG_ENABLE( AC_ARG_ENABLE(
debug, debug,
AC_HELP_STRING(--enable-debug, enable debug build flags), AC_HELP_STRING(--enable-debug, enable debug build flags),
found_debug=$enable_debug
) )
AM_CONDITIONAL(IS_DEBUG, test "x$found_debug" = xyes) AM_CONDITIONAL(IS_DEBUG, test "x$enable_debug" = xyes)
# Is this --enable-coverage? # Is this --enable-coverage?
AC_ARG_ENABLE( AC_ARG_ENABLE(
coverage, coverage,
AC_HELP_STRING(--enable-coverage, enable coverage build flags), AC_HELP_STRING(--enable-coverage, enable coverage build flags)
found_coverage=$enable_coverage
) )
AM_CONDITIONAL(IS_COVERAGE, test "x$found_coverage" = xyes) AM_CONDITIONAL(IS_COVERAGE, test "x$enable_coverage" = xyes)
# Is this --enable-profile? # Is this --enable-profile?
AC_ARG_ENABLE( AC_ARG_ENABLE(
profile, profile,
AC_HELP_STRING(--enable-profile, enable profile build flags), AC_HELP_STRING(--enable-profile, enable profile build flags)
found_profile=$enable_profile
) )
AM_CONDITIONAL(IS_PROFILE, test "x$found_profile" = xyes) AM_CONDITIONAL(IS_PROFILE, test "x$enable_profile" = xyes)
# Is this a static build? # Is this a static build?
AC_ARG_ENABLE( AC_ARG_ENABLE(
static, static,
AC_HELP_STRING(--enable-static, create a static build), AC_HELP_STRING(--enable-static, create a static build)
found_static=$enable_static
) )
if test "x$found_static" = xyes; then if test "x$enable_static" = xyes; then
LDFLAGS="$LDFLAGS -static" LDFLAGS="$LDFLAGS -static"
test "x$PKG_CONFIG" != x && PKG_CONFIG="$PKG_CONFIG --static" test "x$PKG_CONFIG" != x && PKG_CONFIG="$PKG_CONFIG --static"
fi fi
@ -205,20 +201,18 @@ fi
# Look for utempter. # Look for utempter.
AC_ARG_ENABLE( AC_ARG_ENABLE(
utempter, utempter,
AC_HELP_STRING(--enable-utempter, use utempter if it is installed), AC_HELP_STRING(--enable-utempter, use utempter if it is installed)
found_utempter=$enable_utempter,
found_utempter=yes
) )
if test "x$found_utempter" = xyes; then if test "x$enable_utempter" = xyes; then
AC_CHECK_HEADER(utempter.h, found_utempter=yes, found_utempter=no) AC_CHECK_HEADER(utempter.h, enable_utempter=yes, enable_utempter=no)
if test "x$found_utempter" = xyes; then if test "x$enable_utempter" = xyes; then
AC_SEARCH_LIBS( AC_SEARCH_LIBS(
utempter_add_record, utempter_add_record,
utempter, utempter,
found_utempter=yes, enable_utempter=yes,
found_utempter=no enable_utempter=no
) )
if test "x$found_utempter" = xyes; then if test "x$enable_utempter" = xyes; then
AC_DEFINE(HAVE_UTEMPTER) AC_DEFINE(HAVE_UTEMPTER)
fi fi
fi fi
@ -227,25 +221,23 @@ fi
# Look for utf8proc. # Look for utf8proc.
AC_ARG_ENABLE( AC_ARG_ENABLE(
utf8proc, utf8proc,
AC_HELP_STRING(--enable-utf8proc, use utf8proc if it is installed), AC_HELP_STRING(--enable-utf8proc, use utf8proc if it is installed)
found_utf8proc=$enable_utf8proc,
found_utf8proc=no
) )
if test "x$found_utf8proc" = xyes; then if test "x$enable_utf8proc" = xyes; then
AC_CHECK_HEADER(utf8proc.h, found_utf8proc=yes, found_utf8proc=no) AC_CHECK_HEADER(utf8proc.h, enable_utf8proc=yes, enable_utf8proc=no)
if test "x$found_utf8proc" = xyes; then if test "x$enable_utf8proc" = xyes; then
AC_SEARCH_LIBS( AC_SEARCH_LIBS(
utf8proc_charwidth, utf8proc_charwidth,
utf8proc, utf8proc,
found_utf8proc=yes, enable_utf8proc=yes,
found_utf8proc=no enable_utf8proc=no
) )
if test "x$found_utf8proc" = xyes; then if test "x$enable_utf8proc" = xyes; then
AC_DEFINE(HAVE_UTF8PROC) AC_DEFINE(HAVE_UTF8PROC)
fi fi
fi fi
fi fi
AM_CONDITIONAL(HAVE_UTF8PROC, [test "x$found_utf8proc" = xyes]) AM_CONDITIONAL(HAVE_UTF8PROC, [test "x$enable_utf8proc" = xyes])
# Check for b64_ntop. # Check for b64_ntop.
AC_MSG_CHECKING(for b64_ntop) AC_MSG_CHECKING(for b64_ntop)