emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

build-sys: allow a build when libdl.so is truly absent

Browse Source 
The earlier commit purporting to allow top to be built
in the absence of that dynamic linking library stopped
just a little short of the truth. So this will fix it.

Reference(s):
commit 5686877cd4

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2013-05-05 00:00:00 -05:00 committed by Craig Small
parent dbe27d3ad1
commit 25201bc9fe
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -195,6 +195,7 @@ if test "x$enable_sigwinch" = xyes; then
AC_DEFINE(SIGNALS_LESS, 1, [reduce impact of x-windows resize operations on top]) AC_DEFINE(SIGNALS_LESS, 1, [reduce impact of x-windows resize operations on top])
fi fi
DL_LIB=
AC_ARG_ENABLE([numa], AC_ARG_ENABLE([numa],
AS_HELP_STRING([--disable-numa], [disable NUMA/Node support in top]), AS_HELP_STRING([--disable-numa], [disable NUMA/Node support in top]),
[disable_numa=yes], []) [disable_numa=yes], [])
@ -203,7 +204,9 @@ if test "x$disable_numa" = x"yes"; then
else else
AC_SEARCH_LIBS([dlopen], [dl], [], AC_SEARCH_LIBS([dlopen], [dl], [],
[AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])]) [AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])])
DL_LIB="$ac_cv_search_dlopen"
fi fi
AC_SUBST([DL_LIB])
AC_ARG_ENABLE([w-from], AC_ARG_ENABLE([w-from],
AS_HELP_STRING([--enable-w-from], [enable w from field by default]), AS_HELP_STRING([--enable-w-from], [enable w from field by default]),

3
top/Makefile.am
View File

@ -3,7 +3,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-DLOCALEDIR=\"$(localedir)\" -DLOCALEDIR=\"$(localedir)\"
AM_LDFLAGS = ../proc/libprocps.la -ldl AM_LDFLAGS = ../proc/libprocps.la
AM_LDFLAGS += $(DL_LIB)
if WITH_NCURSES if WITH_NCURSES
usrbin_exec_PROGRAMS = \ usrbin_exec_PROGRAMS = \