circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 22:43:58 +00:00
Code Issues Projects Releases Wiki Activity

Use AC_USE_SYSTEM_EXTENSIONS and explicitly check for daemon() in headers.

Browse Source
This commit is contained in:
Nicholas Marriott
2017-03-22 07:42:45 +00:00
parent 3cc2486106
commit 080080fa23
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -14,12 +14,6 @@ dist-hook:
# Preprocessor flags. # Preprocessor flags.
AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\"" AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\""
# glibc as usual does things ass-backwards and hides useful things by default,
# so everyone has to add this.
if IS_GLIBC
AM_CFLAGS += -D_GNU_SOURCE
endif
# Set flags for gcc. # Set flags for gcc.
if IS_GCC if IS_GCC
AM_CFLAGS += -std=gnu99 -O2 AM_CFLAGS += -std=gnu99 -O2
@ -47,9 +41,9 @@ endif
# Set flags for Solaris. # Set flags for Solaris.
if IS_SUNOS if IS_SUNOS
if IS_GCC if IS_GCC
AM_CPPFLAGS += -D_XPG6 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS AM_CPPFLAGS += -D_XPG6 -D_POSIX_PTHREAD_SEMANTICS
else else
AM_CPPFLAGS += -D_XPG4_2 -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS AM_CPPFLAGS += -D_XPG4_2 -D_POSIX_PTHREAD_SEMANTICS
endif endif
endif endif

27
configure.ac
View File

@ -1,6 +1,7 @@
# configure.ac # configure.ac
AC_INIT(tmux, master) AC_INIT(tmux, master)
AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc) AC_CONFIG_AUX_DIR(etc)
AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_INIT_AUTOMAKE([foreign subdir-objects])
@ -26,6 +27,7 @@ AC_PROG_CPP
AC_PROG_EGREP AC_PROG_EGREP
AC_PROG_INSTALL AC_PROG_INSTALL
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AC_USE_SYSTEM_EXTENSIONS
# Default tmux.conf goes in /etc not ${prefix}/etc. # Default tmux.conf goes in /etc not ${prefix}/etc.
test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
@ -79,22 +81,6 @@ AC_EGREP_CPP(
) )
AM_CONDITIONAL(IS_SUNCC, test "x$found_suncc" = xyes) AM_CONDITIONAL(IS_SUNCC, test "x$found_suncc" = xyes)
# Is this glibc?
AC_MSG_CHECKING(for glibc)
AC_EGREP_CPP(
yes,
[
#include <features.h>
#ifdef __GLIBC__
yes
#endif
],
found_glibc=yes,
found_glibc=no
)
AM_CONDITIONAL(IS_GLIBC, test "x$found_glibc" = xyes)
AC_MSG_RESULT($found_glibc)
# Check for various headers. Alternatives included from compat.h. # Check for various headers. Alternatives included from compat.h.
AC_CHECK_HEADERS( AC_CHECK_HEADERS(
[ \ [ \
@ -390,6 +376,15 @@ AM_CONDITIONAL(NO_CLOSEFROM, [test "x$found_closefrom" = xno])
# Look for daemon, compat/daemon.c used if missing. # Look for daemon, compat/daemon.c used if missing.
AC_CHECK_FUNC(daemon, found_daemon=yes, found_daemon=no) AC_CHECK_FUNC(daemon, found_daemon=yes, found_daemon=no)
AC_CHECK_DECL(
daemon,
,
found_daemon=no,
[
#include <stdlib.h>
#include <unistd.h>
]
)
if test "x$found_daemon" = xyes; then if test "x$found_daemon" = xyes; then
AC_DEFINE(HAVE_DAEMON) AC_DEFINE(HAVE_DAEMON)
fi fi