From 25201bc9fea611b22674f8a2460f4858281352bc Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Sun, 5 May 2013 00:00:00 -0500 Subject: [PATCH] build-sys: allow a build when libdl.so is truly absent 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 5686877cd4c83a2daf1be6f2f7f93cd2c1451e75 Signed-off-by: Jim Warner --- configure.ac | 3 +++ top/Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dcc351c4..19a8f260 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) fi +DL_LIB= AC_ARG_ENABLE([numa], AS_HELP_STRING([--disable-numa], [disable NUMA/Node support in top]), [disable_numa=yes], []) @@ -203,7 +204,9 @@ if test "x$disable_numa" = x"yes"; then else AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])]) + DL_LIB="$ac_cv_search_dlopen" fi +AC_SUBST([DL_LIB]) AC_ARG_ENABLE([w-from], AS_HELP_STRING([--enable-w-from], [enable w from field by default]), diff --git a/top/Makefile.am b/top/Makefile.am index 4958e54c..bba36bc9 100644 --- a/top/Makefile.am +++ b/top/Makefile.am @@ -3,7 +3,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -DLOCALEDIR=\"$(localedir)\" -AM_LDFLAGS = ../proc/libprocps.la -ldl +AM_LDFLAGS = ../proc/libprocps.la +AM_LDFLAGS += $(DL_LIB) if WITH_NCURSES usrbin_exec_PROGRAMS = \