[lmi-commits] [5971] Remove the possibility to build Boost.Filesystem from configure.

[Vadim Zeitlin]

Revision: 5971
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5971
Author:   zeitlin
Date:     2014-10-06 17:37:55 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Remove the possibility to build Boost.Filesystem from configure.

This wasn't really useful and didn't work correctly in almost any environment
as the list of files in configure is specific to the Boost version 1.33 which
can't be built using g++ 4 and so we would need to make it conditional to
support both 1.33 and some later version, which just doesn't seem to be worth
it.

Simply use the system version of the library instead, just as we do for
Boost.Regex already.

Modified Paths:
--------------
    lmi/trunk/Makefile.am
    lmi/trunk/configure.ac

Removed Paths:
-------------
    lmi/trunk/third_party/Makefile.am
    lmi/trunk/third_party/boostfs/Makefile.am

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2014-10-06 17:37:49 UTC (rev 5970)
+++ lmi/trunk/Makefile.am       2014-10-06 17:37:55 UTC (rev 5971)
@@ -22,8 +22,6 @@
 
 # $Id$
 
-SUBDIRS = third_party
-
 ##############################################################################
 # Common compilation flags
 ##############################################################################

Modified: lmi/trunk/configure.ac
===================================================================
--- lmi/trunk/configure.ac      2014-10-06 17:37:49 UTC (rev 5970)
+++ lmi/trunk/configure.ac      2014-10-06 17:37:55 UTC (rev 5971)
@@ -67,9 +67,6 @@
 AC_ARG_WITH(boost-toolkit,
             [AC_HELP_STRING([--with-boost-toolkit=dir], [Boost installation 
toolkit (gcc, mgw, etc.)])],
             lmi_boost_toolkit=$withval)
-AC_ARG_WITH(boost-filesystem-src,
-            [AC_HELP_STRING([--with-boost-filesystem-src=dir], [Boost 
filesystem library sources directory (./libs/filesystem/src directory in the 
boost default package). That option is only useful for the in-project 
boost::filesystem library compilation])],
-            lmi_boost_filesystem_src=$withval)
 
 dnl add support for --wxdir, --wx-config, --wx-prefix, ----wx-exec-prefix
 WX_CONFIG_OPTIONS
@@ -386,12 +383,10 @@
 dnl we are forced to use a bit more sophisticated construct
 
 LIBS="$LIBS $BOOST_LIBS -l$boost_libfs"
-LMI_BOOSTFS_BUILD=0
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <boost/filesystem/operations.hpp>]],
     [[boost::filesystem::current_path()]])],
     [],
-    [LMI_BOOSTFS_BUILD=1
-    AC_MSG_WARN([Boost filesystem library $boost_libfs not found, $errmsg])]
+    [AC_MSG_ERROR([Boost filesystem library $boost_libfs not found, $errmsg])]
 )
 
 LIBS="$save_LIBS -l$boost_libregex"
@@ -404,46 +399,12 @@
 LDFLAGS=$save_LDFLAGS
 LIBS=$save_LIBS
 
-if test "x$LMI_BOOSTFS_BUILD" == "x1"; then
+BOOST_LIBS="-l$boost_libfs -l$boost_libregex -l$boost_libsystem"
 
-dnl we have no boost::filesystem library available on the machine - lets check 
for its sources
-LMI_BOOSTFS_SRC=$lmi_boost_filesystem_src
-dnl if the user has not specified --with-boost-filesystem-src then guess it 
using --with-boost-headers
-if test "x$LMI_BOOSTFS_SRC" == "x"; then
-    if test "x$lmi_boost_headers" != "x"; then
-        LMI_BOOSTFS_SRC="$lmi_boost_headers/../libs/filesystem/src"
-    fi
-fi
-if test "x$LMI_BOOSTFS_SRC" == "x"; then
-    LMI_BOOSTFS_SRC="."
-fi
-
-for f in convenience.cpp exception.cpp operations_posix_windows.cpp 
path_posix_windows.cpp; do
-  if ! test -r $LMI_BOOSTFS_SRC/$f; then
-    no_boost_fs=1
-  fi
-done
-
-if test "x$no_boost_fs" == "x1"; then
-    AC_MSG_ERROR([no boost::filesystem source files found in 
($LMI_BOOSTFS_SRC)])
-fi
-
-BOOST_LIBS=third_party/boostfs/libboost_filesystem.la
-else
-BOOST_LIBS="$BOOST_LDFLAGS $BOOST_LIBS -l$boost_libfs"
-fi
-
-BOOST_LIBS="$BOOST_LIBS -l$boost_libregex"
-
 dnl contains flags needed to link to externally or internally built
 dnl boost libraries
 AC_SUBST(BOOST_LIBS)
 
-dnl indicates weither do we need to build internally boost::filesystem library
-AM_CONDITIONAL([LMI_BOOSTFS_BUILD], [test "x$LMI_BOOSTFS_BUILD" == "x1"])
-dnl indicates the directory path where sources could be found
-AC_SUBST(LMI_BOOSTFS_SRC)
-
 dnl check for the other required libraries: under Unix we use pkg-config which
 dnl is easily available for (and often already installed under) any Linux
 dnl system but when using MSYS we do the checks manually as installing
@@ -593,5 +554,5 @@
 fi
 
 dnl === Generate output files ===
-AC_CONFIG_FILES([Makefile third_party/Makefile third_party/boostfs/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

Deleted: lmi/trunk/third_party/Makefile.am
===================================================================
--- lmi/trunk/third_party/Makefile.am   2014-10-06 17:37:49 UTC (rev 5970)
+++ lmi/trunk/third_party/Makefile.am   2014-10-06 17:37:55 UTC (rev 5971)
@@ -1,29 +0,0 @@
-# Master automake makefile, run automake from the top directory
-# to generate Makefile from it (this # is also done by autogen.sh script)
-#
-# Copyright (C) 2005, 2006, 2007 Vadim Zeitlin.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# http://savannah.nongnu.org/projects/lmi
-# email: <address@hidden>
-# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-# $Id$
-
-
-# Packages correspond to external libraries which we want to build inplace
-# using official sources but not official libraries for some reason
-
-SUBDIRS = boostfs

Deleted: lmi/trunk/third_party/boostfs/Makefile.am
===================================================================
--- lmi/trunk/third_party/boostfs/Makefile.am   2014-10-06 17:37:49 UTC (rev 
5970)
+++ lmi/trunk/third_party/boostfs/Makefile.am   2014-10-06 17:37:55 UTC (rev 
5971)
@@ -1,43 +0,0 @@
-# Master automake makefile, run automake from the top directory
-# to generate Makefile from it (this # is also done by autogen.sh script)
-#
-# Copyright (C) 2005, 2006, 2007 Vadim Zeitlin.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# http://savannah.nongnu.org/projects/lmi
-# email: <address@hidden>
-# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-# $Id$
-
-
-if LMI_BOOSTFS_BUILD
-noinst_LTLIBRARIES=libboost_filesystem.la
-else
-noinst_LTLIBRARIES=
-endif
-
-# look for boost sources in the directory determined by configure
-vpath %.cpp $(LMI_BOOSTFS_SRC)
-
-# we do not want the sources to be included into the distribution
-nodist_libboost_filesystem_la_SOURCES = \
-    convenience.cpp \
-    exception.cpp \
-    operations_posix_windows.cpp \
-    path_posix_windows.cpp 
-libboost_filesystem_la_SOURCES = 
-libboost_filesystem_la_LDFLAGS = -module -no-undefined
-