[buildd-tools-devel] [PATCH 1/6] Drop special handling of Boost.Filesystem libs.

[Jan-Marek Glogowski]

As the Boost.Filesystem libs are now linked into libsbuild, we don't
anymore need the previous special handling.
---
 bin/schroot-mount/Makefile.am |    3 +--
 configure.ac                  |    5 ++---
 debian/changelog              |    6 ++++++
 sbuild/Makefile.am            |    2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/schroot-mount/Makefile.am b/bin/schroot-mount/Makefile.am
index 53a33d4..38b0d69 100644
--- a/bin/schroot-mount/Makefile.am
+++ b/bin/schroot-mount/Makefile.am
@@ -36,6 +36,5 @@ schroot_mount_SOURCES =			\
 	schroot-mount-options.cc	\
 	schroot-mount.cc
 
-schroot_mount_LDADD = $(BOOST_FILESYSTEM_LIBS)			\
-	$(top_builddir)/bin/schroot-base/libschroot-base.la
+schroot_mount_LDADD = $(top_builddir)/bin/schroot-base/libschroot-base.la
 
diff --git a/configure.ac b/configure.ac
index 7653206..45f795c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -677,17 +677,16 @@ define([testprog], [AC_LANG_PROGRAM([#include <boost/filesystem.hpp>],
                                    [boost::filesystem::is_directory("/")])])
 AC_LINK_IFELSE(testprog,
                [AC_MSG_RESULT([yes])
-	        BOOST_FILESYSTEM_LIBS="-lboost_filesystem -lboost_system"],
+	        BOOST_LIBS="${BOOST_LIBS} -lboost_filesystem -lboost_system"],
 [LIBS="${saved_LIBS} -lboost_filesystem-mt -lboost_system-mt"
  AC_LINK_IFELSE(testprog,
                [AC_MSG_RESULT([yes])
-	        BOOST_FILESYSTEM_LIBS="-lboost_filesystem-mt -lboost_system-mt"],
+	        BOOST_LIBS="${BOOST_LIBS} -lboost_filesystem-mt -lboost_system-mt"],
                [AC_MSG_RESULT([no])
 	        AC_MSG_FAILURE([libboost_filesystem (Boost C++ Libraries) is not installed, but is required by schroot])])])
 LIBS="${saved_LIBS}"
 
 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>
diff --git a/debian/changelog b/debian/changelog
index 9b6049d..c68335b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+schroot (1.4.24-1) unstable; urgency=low
+
+  * Drop special handling of Boost.Filesystem libs.
+
+ -- Jan-Marek Glogowski <jan-marek.glogowski at muenchen.de>  Thu, 23 Jun 2011 14:35:25 +0200
+
 schroot (1.4.23-1) unstable; urgency=low
 
   * New upstream stable release.
diff --git a/sbuild/Makefile.am b/sbuild/Makefile.am
index 4da2093..b0dcae8 100644
--- a/sbuild/Makefile.am
+++ b/sbuild/Makefile.am
@@ -204,7 +204,7 @@ libsbuild_la_SOURCES =					\
 nodist_libsbuild_la_SOURCES =	\
 	sbuild-config.h
 
-libsbuild_la_LIBADD = $(UUID_LIBS) $(PAM_LIBS) $(LOCKDEV_LIBS) $(BOOST_LIBS) $(BOOST_FILESYSTEM_LIBS) $(LIBINTL)
+libsbuild_la_LIBADD = $(UUID_LIBS) $(PAM_LIBS) $(LOCKDEV_LIBS) $(BOOST_LIBS) $(LIBINTL)
 
 pkgconfigdatadir = $(libdir)/pkgconfig
 
-- 
1.7.2.5