diff options
| author |  Ton Voon <tonvoon@users.sourceforge.net>
| 2006-03-16 17:31:11 +0000 |
|---|---|---|
| committer | Ton Voon <tonvoon@users.sourceforge.net>
| 2006-03-16 17:31:11 +0000 |
| commit | dc35902e3071b24749b6779e5a16c477e84a97a0 (patch) | |
| tree | 6d0baaa5f828c18d3c3b6bf31aa23ffd6ee4fbeb | |
| parent | 1c229b2c4572f1fcf5e1fe470f49df49111816f5 (diff) | |
| download | monitoring-plugins-dc35902e3071b24749b6779e5a16c477e84a97a0.tar.gz | |
Using libtool to get runpath for tap library
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1325 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | plugins/tests/Makefile.am | 4 | ||||
| -rwxr-xr-x | tools/setup | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/configure.in b/configure.in index ddbde159..d1ef9543 100644 --- a/configure.in +++ b/configure.in @@ -23,7 +23,7 @@ gl_USE_SYSTEM_EXTENSIONS AC_PROG_CC AC_PROG_CPP AC_PROG_GCC_TRADITIONAL -AC_PROG_RANLIB +AC_PROG_LIBTOOL AC_PROG_MAKE_SET AC_PROG_AWK @@ -168,10 +168,8 @@ AC_SUBST(MATHLIBS) dnl Check for libtap, to run perl-like tests AC_CHECK_LIB(tap, plan_tests, - TAPLIBS="-ltap" EXTRA_TEST=test_utils AC_SUBST(EXTRA_TEST) - AC_SUBST(TAPLIBS) ) dnl Check for PostgreSQL libraries diff --git a/plugins/tests/Makefile.am b/plugins/tests/Makefile.am index c73725de..d3e74945 100644 --- a/plugins/tests/Makefile.am +++ b/plugins/tests/Makefile.am @@ -15,8 +15,8 @@ LIBS = @LIBINTL@ test_utils_SOURCES = test_utils.c test_utils_CFLAGS = -g -I.. -test_utils_LDFLAGS = -L.. -test_utils_LDADD = ../utils.o $(TAPLIBS) +test_utils_LDFLAGS = -rpath /usr/local/lib -ltap +test_utils_LDADD = ../utils.o test: ${noinst_PROGRAMS} perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS) diff --git a/tools/setup b/tools/setup index 39c6f74a..be625abd 100755 --- a/tools/setup +++ b/tools/setup @@ -20,6 +20,7 @@ fi autopoint --force aclocal -I m4 +libtoolize --force --copy autoheader automake --add-missing --force-missing --copy autoconf |