Przeglądaj źródła

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
Ton Voon 20 lat temu
rodzic
commit
dc35902e30
3 zmienionych plików z 4 dodań i 5 usunięć
  1. 1 3
      configure.in
  2. 2 2
      plugins/tests/Makefile.am
  3. 1 0
      tools/setup

+ 1 - 3
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

+ 2 - 2
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)

+ 1 - 0
tools/setup

@@ -20,6 +20,7 @@ fi
 
 autopoint --force
 aclocal -I m4
+libtoolize --force --copy
 autoheader
 automake --add-missing --force-missing --copy
 autoconf