430b559ba2
The "usrbin_execdir" hack meant to install some binaries in /bin and others in /usr/bin. However: - It is very inflexible: not much control on the final directory name and it is not possible to get rid of the usr/bin suffix without patching the build system. - It is hard to use: it requires configure to receive --exec_prefix=/ and other settings do not make much sense. It is not very obvious that that setting needs to be passed and it takes a while to figure it out. - It produces garbage with the default setup: the default prefix of /usr/local ends up installing the binaries under /usr/local/usr/bin which does not make any sense. Furthermore, the requirement to split binaries in /bin and /usr/bin is not that strong since some distributions adopted the /usr merge and so would agree to just deploy all binaries to /usr/bin directly. Distributions that would still like to split /bin from /usr/bin should actually move binaries such as `ps` and `kill` to /bin after the install of procps-ng is complete. After all, they are the ones responsible for determining what are the binaries that need to be in the root partition and that list depends on their early boot init scripts, so it is possible that the list must be augmented with other binaries from this package. Therefore, I propose here to get rid of that hack and simply install all the binaries to bindir instead, which solves the problems described above and simplifies the build and install of procps-ng. Tested that it builds and both `make check` and `make distcheck` work. Tested that `make install` works and produces the expected tree, the only difference being the absence of the bogus /usr/local/usr/bin directory and now all binaries are merged into /usr/local/bin as expected. Signed-off-by: Filipe Brandenburger <filbranden@google.com>
279 lines
8.9 KiB
Plaintext
279 lines
8.9 KiB
Plaintext
# -*- Autoconf -*-
|
|
# Process this file with autoconf to produce a configure script.
|
|
|
|
AC_PREREQ([2.69])
|
|
AC_CONFIG_MACRO_DIR([m4])
|
|
AC_INIT([procps-ng],
|
|
m4_esyscmd([misc/git-version-gen .tarball-version]),
|
|
[procps@freelists.org],,[http://gitorious.org/procps])
|
|
AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
|
|
AM_SILENT_RULES([yes])
|
|
AC_CONFIG_SRCDIR([free.c])
|
|
AC_CONFIG_HEADERS([config.h])
|
|
|
|
# Checks for programs.
|
|
AC_USE_SYSTEM_EXTENSIONS(_GNU_SOURCE)
|
|
AC_PROG_CXX
|
|
AC_PROG_AWK
|
|
AC_PROG_CC
|
|
AC_PROG_CC_STDC
|
|
if test "$cross_compiling" = no; then
|
|
if test "x$ac_cv_prog_cc_c99" = "xno" || test "x$ac_cv_prog_cc_c99" = "x"; then
|
|
# We might be on RHEL5 with a git checkout and so broken
|
|
# autoconf. Check if CC is gcc and if it bails when given -std=gnu99.
|
|
# If not, use that. Yuck.
|
|
if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
|
|
CC="$CC -std=gnu99"
|
|
AC_RUN_IFELSE(
|
|
[AC_LANG_PROGRAM([],[[
|
|
return 0;
|
|
]])],
|
|
[],
|
|
[AC_MSG_ERROR([Could not find a C99 compatible compiler])])
|
|
else
|
|
AC_MSG_ERROR([Could not find a C99 compatible compiler])
|
|
fi
|
|
fi
|
|
fi
|
|
AM_PROG_CC_C_O
|
|
AC_PROG_CPP
|
|
AC_PROG_INSTALL
|
|
AC_PROG_LN_S
|
|
PKG_PROG_PKG_CONFIG
|
|
AC_PROG_MAKE_SET
|
|
|
|
# Checks for header files.
|
|
AC_HEADER_MAJOR
|
|
AC_CHECK_HEADERS([arpa/inet.h fcntl.h langinfo.h libintl.h limits.h locale.h netinet/in.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h values.h wchar.h wctype.h])
|
|
|
|
# Checks for typedefs, structures, and compiler characteristics.
|
|
AC_CHECK_HEADER_STDBOOL
|
|
AC_TYPE_UID_T
|
|
AC_C_INLINE
|
|
AC_TYPE_INT32_T
|
|
AC_TYPE_PID_T
|
|
AC_C_RESTRICT
|
|
AC_TYPE_SIZE_T
|
|
AC_TYPE_SSIZE_T
|
|
AC_CHECK_MEMBERS([struct stat.st_rdev])
|
|
|
|
dnl libtool
|
|
LT_INIT
|
|
|
|
# Checks for library functions.
|
|
AC_FUNC_ERROR_AT_LINE
|
|
AC_FUNC_FORK
|
|
AC_FUNC_MALLOC
|
|
AC_FUNC_MBRTOWC
|
|
AC_FUNC_MMAP
|
|
AC_FUNC_REALLOC
|
|
AC_FUNC_STRTOD
|
|
|
|
AM_GNU_GETTEXT_VERSION([0.14.1])
|
|
AM_GNU_GETTEXT([external])
|
|
if test -d "$srcdir/po"
|
|
then
|
|
ALL_LINGUAS=`cd $srcdir/po > /dev/null && echo *.po | sed 's/\.po//g'`
|
|
else
|
|
ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et eu_ES fa fi fr gl gu he hi hr hu hy id is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nn no nso or pa pl pt_BR pt ro ru si sk sl sq sr@Latn sr sv ta te th tr uk ur vi zh_CN zh_TW zu"
|
|
fi
|
|
|
|
AC_CHECK_HEADERS(error.h, [], [], AC_INCLUDES_DEFAULT)
|
|
|
|
AC_CHECK_HEADERS(stdio_ext.h, [], [], AC_INCLUDES_DEFAULT)
|
|
|
|
AC_MSG_CHECKING(whether program_invocation_name is defined)
|
|
AC_TRY_COMPILE([#include <errno.h>],
|
|
[program_invocation_name = "test";],
|
|
AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME, 1,
|
|
[Define if program_invocation_name is defined])
|
|
AC_MSG_RESULT(yes),
|
|
AC_MSG_RESULT(no))
|
|
|
|
AC_MSG_CHECKING(whether program_invocation_short_name is defined)
|
|
AC_TRY_COMPILE([#include <errno.h>],
|
|
[program_invocation_short_name = "test";],
|
|
AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
|
|
[Define if program_invocation_short_name is defined])
|
|
AC_MSG_RESULT(yes),
|
|
AC_MSG_RESULT(no))
|
|
|
|
dnl watch8bit must be before the AC_ARG_WITH set as it sets up ncurses
|
|
AC_SUBST([WITH_WATCH8BIT])
|
|
AC_ARG_ENABLE([watch8bit],
|
|
AS_HELP_STRING([--enable-watch8bit], [enable watch to be 8bit clean (requires ncursesw)]),
|
|
[], [enable_watch8bit=no]
|
|
)
|
|
if test "$enable_watch8bit" = "yes"; then
|
|
AC_DEFINE([WITH_WATCH8BIT], [1], [Enable 8 bit clean watch])
|
|
fi
|
|
|
|
AC_ARG_ENABLE([libselinux],
|
|
AS_HELP_STRING([--enable-libselinux], [enable libselinux]),
|
|
[], [enable_libselinux=no]
|
|
)
|
|
if test "$enable_libselinux" = "yes"; then
|
|
AC_DEFINE([ENABLE_LIBSELINUX], [1], [Enable libselinux])
|
|
fi
|
|
|
|
# Optional packages - AC_ARG_WITH
|
|
AC_ARG_WITH([ncurses],
|
|
AS_HELP_STRING([--without-ncurses], [build only applications not needing ncurses]),
|
|
[], [with_ncurses=yes]
|
|
)
|
|
if test "x$with_ncurses" = xno; then
|
|
AM_CONDITIONAL(WITH_NCURSES, false)
|
|
else
|
|
PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
|
|
AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
|
|
AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
|
|
if test "x$have_ncurses" = xno; then
|
|
AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
|
|
fi
|
|
NCURSES_LIBS="-lncurses"
|
|
])
|
|
AM_CONDITIONAL(WITH_NCURSES, true)
|
|
if test "$enable_watch8bit" = yes; then
|
|
PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
|
|
AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
|
|
[AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
|
|
])
|
|
else
|
|
WATCH_NCURSES_LIBS="$NCURSES_LIBS"
|
|
fi
|
|
fi
|
|
AC_SUBST([NCURSES_LIBS])
|
|
AC_SUBST([WATCH_NCURSES_LIBS])
|
|
|
|
AC_ARG_WITH([systemd],
|
|
[AS_HELP_STRING([--with-systemd], [enable systemd support])],
|
|
[], [with_systemd=no]
|
|
)
|
|
if test "x$with_systemd" != xno; then
|
|
PKG_CHECK_MODULES([SYSTEMD], [libsystemd-login >= 206], [], [
|
|
AC_CHECK_LIB(systemd-login, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no])
|
|
if test "x$have_systemd" = xno; then
|
|
AC_MSG_ERROR([systemd support missing/incomplete (requires >= 206)])
|
|
fi
|
|
SYSTEMD_LIBS="-lsystemd-login"
|
|
])
|
|
AM_CONDITIONAL(WITH_SYSTEMD, true)
|
|
AC_DEFINE(WITH_SYSTEMD, 1, [enable systemd support])
|
|
else
|
|
AM_CONDITIONAL(WITH_SYSTEMD, false)
|
|
fi
|
|
|
|
# AC_ARG_ENABLEs
|
|
AC_ARG_ENABLE([pidof],
|
|
AS_HELP_STRING([--disable-pidof], [do not build pidof]),
|
|
[], [enable_pidof=yes]
|
|
)
|
|
AM_CONDITIONAL(BUILD_PIDOF, test "x$enable_pidof" = xyes)
|
|
|
|
AC_ARG_ENABLE([kill],
|
|
AS_HELP_STRING([--disable-kill], [do not build kill]),
|
|
[], [enable_kill=yes]
|
|
)
|
|
AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes)
|
|
AM_CONDITIONAL(LINUX, test "x$host_os" = xlinux-gnu)
|
|
|
|
AC_ARG_ENABLE([skill],
|
|
AS_HELP_STRING([--enable-skill], [build skill and snice]),
|
|
[], [enable_skill=no]
|
|
)
|
|
AM_CONDITIONAL(BUILD_SKILL, test "x$enable_skill" = xyes)
|
|
|
|
AC_ARG_ENABLE([examples],
|
|
AS_HELP_STRING([--enable-examples], [add example files to installation]),
|
|
[], [enable_examples=no]
|
|
)
|
|
AM_CONDITIONAL(EXAMPLE_FILES, test "x$enable_examples" = xyes)
|
|
|
|
AC_ARG_ENABLE([oomem],
|
|
AS_HELP_STRING([--enable-oomem], [add out-of-memory fields to the library and top]),
|
|
[], [enable_oomem=no]
|
|
)
|
|
if test "x$enable_oomem" = xyes; then
|
|
AC_DEFINE(OOMEM_ENABLE, 1, [add out-of-memory fields to the library and top])
|
|
fi
|
|
|
|
AC_ARG_ENABLE([sigwinch],
|
|
AS_HELP_STRING([--enable-sigwinch], [reduce impact of x-windows resize operations on top]),
|
|
[], [enable_sigwinch=no]
|
|
)
|
|
if test "x$enable_sigwinch" = xyes; then
|
|
AC_DEFINE(SIGNALS_LESS, 1, [reduce impact of x-windows resize operations on top])
|
|
fi
|
|
|
|
AC_ARG_ENABLE([wide-percent],
|
|
AS_HELP_STRING([--enable-wide-percent], [provide extra precision under %CPU and %MEM for top]),
|
|
[], [enable_wide_percent=no]
|
|
)
|
|
if test "x$enable_wide_percent" = xyes; then
|
|
AC_DEFINE(BOOST_PERCNT, 1, [provide extra precision under %CPU and %MEM for top])
|
|
fi
|
|
|
|
AC_ARG_ENABLE([wide-memory],
|
|
AS_HELP_STRING([--disable-wide-memory], [disable extra precision under memory fields for top]),
|
|
[], [enable_wide_memory=yes]
|
|
)
|
|
if test "x$enable_wide_memory" = xno; then
|
|
AC_DEFINE(NOBOOST_MEMS, 1, [disable extra precision under memory fields for top])
|
|
fi
|
|
|
|
AC_ARG_ENABLE([modern-top],
|
|
AS_HELP_STRING([--disable-modern-top], [disable new startup defaults, return to original top]),
|
|
[], [enable_modern_top=yes]
|
|
)
|
|
if test "x$enable_modern_top" = xno; then
|
|
AC_DEFINE(ORIG_TOPDEFS, 1, [disable new startup defaults, return to original top])
|
|
fi
|
|
|
|
DL_LIB=
|
|
AC_ARG_ENABLE([numa],
|
|
AS_HELP_STRING([--disable-numa], [disable NUMA/Node support in top]),
|
|
[], [enable_numa=yes]
|
|
)
|
|
if test "x$enable_numa" = xno; then
|
|
AC_DEFINE([NUMA_DISABLE], [1], [disable NUMA/Node support in top])
|
|
else
|
|
AC_SEARCH_LIBS([dlopen], [dl], [],
|
|
[AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])])
|
|
if test "x$ac_cv_search_dlopen" != "xnone required"; then
|
|
DL_LIB="$ac_cv_search_dlopen"
|
|
fi
|
|
fi
|
|
AC_SUBST([DL_LIB])
|
|
|
|
AC_ARG_ENABLE([w-from],
|
|
AS_HELP_STRING([--enable-w-from], [enable w from field by default]),
|
|
[], [enable_w_from=no]
|
|
)
|
|
if test "x$enable_w_from" = xyes; then
|
|
AC_DEFINE(W_SHOWFROM, 1, [enable w from field by default])
|
|
fi
|
|
|
|
AC_ARG_ENABLE([whining],
|
|
AS_HELP_STRING([--disable-whining], [do not print unnecessary warnings (slackware-ism)]),
|
|
[], [enable_whining=yes]
|
|
)
|
|
if test "x$enable_whining" = xyes; then
|
|
AC_DEFINE(BUILD_WITH_WHINE, 1, [should extra warnings be printed (slackware-ism)])
|
|
fi
|
|
|
|
if test x"$DEJAGNU" = x
|
|
then
|
|
DEJAGNU="/dev/null"
|
|
fi
|
|
AC_SUBST(DEJAGNU)
|
|
|
|
AC_CHECK_FUNCS([__fpending alarm atexit dup2 getpagesize gettimeofday iswprint memchr memmove memset munmap nl_langinfo putenv regcomp rpmatch select setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul strtoull strverscmp uname utmpname wcwidth])
|
|
|
|
AC_CONFIG_FILES([Makefile
|
|
include/Makefile
|
|
man-po/Makefile
|
|
po/Makefile.in
|
|
proc/libprocps.pc
|
|
testsuite/Makefile])
|
|
AC_OUTPUT
|