Changeset 21069 for juggler/branches/2.2/modules/vapor

Timestamp:

04/15/08 22:29:53 (5 months ago)

Author:

patrick

Message:

MFT r21067: Handle Boost 1.35 where the new library Boost.System is a

dependency of Boost.Filesystem.

Files:

• juggler/branches/2.2/modules/vapor/Makefile.inc.in (modified) (1 diff)
• juggler/branches/2.2/modules/vapor/Makefile.pre.in (modified) (2 diffs)
• juggler/branches/2.2/modules/vapor/boost_filesystem.fpc.in (modified) (1 diff)
• juggler/branches/2.2/modules/vapor/boost_system.fpc.in (copied) (copied from juggler/trunk/modules/vapor/boost_system.fpc.in)
• juggler/branches/2.2/modules/vapor/configure.ac (modified) (7 diffs)

juggler/branches/2.2/modules/vapor/Makefile.inc.in

@@ -373 +373 @@
-          $(libdir)$(LIBBITSUF)/flagpoll/boost-$(BOOST_VERSION).$(ISA).fpc
-        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \
+          $(topdir)/boost_system.fpc                                    \
+          $(libdir)$(LIBBITSUF)/flagpoll/boost_system-$(BOOST_VERSION).$(ISA).fpc
+        $(INSTALL) -m $(FILE_PERMS) $(GROUP_OPT_UNIX)                   \
-          $(topdir)/boost_filesystem.fpc                                \
-          $(libdir)$(LIBBITSUF)/flagpoll/boost_filesystem-$(BOOST_VERSION).$(ISA).fpc

juggler/branches/2.2/modules/vapor/Makefile.pre.in

@@ -62 +62 @@
-vpr.fpc.in: ;
-boost.fpc.in: ;
+boost_system.fpc.in: ;
-boost_filesystem.fpc.in: ;
-boost_signals.fpc.in: ;
@@ -74 +75 @@
-Makefile: $(srcdir)/VERSION configure config.status Makefile.in         \
-          Makefile.inc.in make.defs.mk.in vpr.fpc.in boost.fpc.in       \
-
+system.fpc.in boost_
-        $(CFG_SHELL) $(srcdir)/configure $(CONFIGURE_ARGS)
-        @$(MAKE) -f Makefile cleandepend

juggler/branches/2.2/modules/vapor/boost_filesystem.fpc.in

@@ -9 +9 @@
-Version: @BOOST_VERSION_DOT@
-Provides: Boost.Filesystem boost.filesystem
-
+ boost.system = @BOOST_VERSION_DOT@
-Arch: @ISA@
-Cflags: @BOOST_INCLUDES@

juggler/branches/2.2/modules/vapor/configure.ac

@@ -138 +138 @@
-DPP_ABI_SETUP
-
+AC_ARG_WITH([boost-system-lib],
+            [  --with-boost-system-lib=<LIB NAME>
+                          The name of the Boost.System
+                          (1.35 and newer) library
+                          suitable for the -l compiler
+                          option                          [default=Auto-detect]],
+            [given_boost_system_libname="$withval"],
+            [given_boost_system_libname=''])
+
-AC_ARG_WITH([boost-fs-lib],
-            [  --with-boost-fs-lib=<LIB NAME>
@@ -639 +648 @@
-                             [$BOOST_LIB_VERSION], [boost_suffixes])
-
+if test "x$given_boost_system_libname" != "x" ; then
+   boost_system_name="$given_boost_system_libname"
+fi
+
-if test "x$given_boost_fs_libname" != "x" ; then
-   boost_fs_name="$given_boost_fs_libname"
@@ -665 +678 @@
-DPP_LANG_CPLUSPLUS
-
+testBoostSystem ( )
+{
+   libname="$1"
+   orig_LIBS="$2"
+
+   # NOTE: We do not need $ABI_FLAGS in $LDFLAGS since $CXXFLAGS and $LDFLAGS
+   # are used together by AC_TRY_LINK().
+   LIBS="-l$libname $orig_LIBS"
+
+   AC_MSG_CHECKING([for boost::system::error_code::clear() in $libname in $cur_boost_libdir])
+   AC_TRY_LINK([#include <boost/system/error_code.hpp>],
+               [boost::system::error_code ec; ec.clear();],
+               [vpr_have_boost_system='yes'], [vpr_have_boost_system='no'])
+   rm -rf ./ii_files
+   AC_MSG_RESULT([$vpr_have_boost_system])
+
+   LIBS="$orig_LIBS"
+}
+
+for l in $libdirs ; do
+   cur_boost_libdir="$BOOST_ROOT/$l"
+   LDFLAGS="-L$cur_boost_libdir $vprsave_LDFLAGS"
+
+   if test "x$boost_system_name" != "x" ; then
+      testBoostSystem $boost_system_name $vprsave_LIBS
+   else
+      # The extra empty string is to allow for no suffix to be used on the
+      # boost_system library name.
+      for s in $boost_suffixes "" ; do
+         cur_boost_system_name="boost_system$s"
+
+         testBoostSystem $cur_boost_system_name $vprsave_LIBS
+
+         if test "$vpr_have_boost_system" = "yes" ; then
+            boost_system_name="$cur_boost_system_name"
+            break
+         fi
+      done
+   fi
+
+   if test "$vpr_have_boost_system" = "yes" ; then
+      BOOST_LIBDIR="$cur_boost_libdir"
+      break
+   fi
+done
+
+if test "x$vpr_have_boost_system" = "xyes" ; then
+   BOOST_SYSTEM_LINK="-l$boost_system_name"
+fi
+
-testBoostFilesystem ( )
-{
@@ -672 +735 @@
-   # NOTE: We do not need $ABI_FLAGS in $LDFLAGS since $CXXFLAGS and $LDFLAGS
-   # are used together by AC_TRY_LINK().
-
+BOOST_SYSTEM_LINK $
-
-   AC_MSG_CHECKING([for boost::filesystem::exists() in $libname in $cur_boost_libdir])
@@ -931 +994 @@
-UNIX_VPRROOT_ABS="$VPRROOT_ABS"
-
-
-
-
-
-
-
+
+
-
-vpr_lib_name="vpr$LIBRARY_VERSION"
@@ -1101 +1160 @@
-AC_SUBST(BOOST_VERSION_DOT)
-AC_SUBST(BOOST_LIBDIR)
+AC_SUBST(BOOST_SYSTEM_LINK)
-AC_SUBST(BOOST_FS_LINK)
-AC_SUBST(boost_fs_name)
-AC_SUBST(BOOST_SIGNALS_LINK)
-AC_SUBST(boost_signals_name)
-AC_SUBST(subsystem_cxxflags)
-AC_SUBST(subsystem_libs)
@@ -1126 +1184 @@
-AC_CONFIG_FILES([
-   boost.fpc
+   boost_system.fpc
-   boost_filesystem.fpc
-   boost_signals.fpc