summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2009-03-28 01:53:55 +0000
committerRoger Leigh <rleigh@debian.org>2009-03-28 13:04:30 +0000
commit5d7b1dba1a6978b0f7136445d7cd856f1d75f971 (patch)
tree1876710f095cd11efc070da70519806bebd53195
parent609496cca9c1b12303540e2be70bb79222ec7b4e (diff)
downloadschroot-5d7b1dba1a6978b0f7136445d7cd856f1d75f971.tar.gz
[build] Just link schroot-mount to boost filesystem lib
Follow suggestion from dh_shlibdeps, as no other program uses symbols from libboost_filesystem. Signed-off-by: Roger Leigh <rleigh@debian.org>
-rw-r--r--bin/schroot-mount/Makefile.am5
-rw-r--r--configure.ac3
2 files changed, 6 insertions, 2 deletions
diff --git a/bin/schroot-mount/Makefile.am b/bin/schroot-mount/Makefile.am
index 2ef80468..fe45ac44 100644
--- a/bin/schroot-mount/Makefile.am
+++ b/bin/schroot-mount/Makefile.am
@@ -35,4 +35,7 @@ schroot_mount_SOURCES = \
schroot-mount-options.h \
schroot-mount-options.cc \
schroot-mount.cc
-schroot_mount_LDADD = $(top_builddir)/bin/schroot-base/libschroot-base.la
+
+schroot_mount_LDADD = $(BOOST_FILESYSTEM_LIBS) \
+ $(top_builddir)/bin/schroot-base/libschroot-base.la
+
diff --git a/configure.ac b/configure.ac
index 17415350..8c5081f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,12 +309,13 @@ LDFLAGS="${LDFLAGS} -lboost_filesystem-mt"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/filesystem.hpp>],
[boost::filesystem::is_directory("/")])],
[AC_MSG_RESULT([yes])
- BOOST_LIBS="${BOOST_LIBS} -lboost_filesystem-mt"],
+ BOOST_FILESYSTEM_LIBS="-lboost_filesystem-mt"],
[AC_MSG_RESULT([no])
AC_MSG_FAILURE([libboost_filesystem (Boost C++ Libraries) is not installed, but is required by schroot])])
LDFLAGS="${saved_ldflags}"
AC_SUBST([BOOST_LIBS])
+AC_SUBST([BOOST_FILESYSTEM_LIBS])
AC_MSG_CHECKING([for __gnu_cxx::stdio_filebuf in libstdc++])
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ext/stdio_filebuf.h>