Changeset 6147

Timestamp:

2008-04-13 14:37:10 (3 months ago)

Author:

emostar

Message:

Require boost 1.33.1 or greater to be present.

Files:

• trunk/admin/acinclude.m4.in (modified) (3 diffs)
• trunk/licq/configure.ac (modified) (1 diff)

trunk/admin/acinclude.m4.in

@@ -97 +97 @@
-dnl Check if it is possible to turn off exceptions/rtti support
-AC_DEFUN([LICQ_CXX_FLAGS],
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  AC_ARG_ENABLE(debug,
-    [  --enable-debug          creates debugging code],
@@ -127 +114 @@
-dnl Check if it is possible to turn off exceptions support
-AC_DEFUN([LICQDAEMON_CXX_FLAGS],
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  AC_ARG_ENABLE(debug,
-    [  --enable-debug          creates debugging code],
-
-
+
-if test "$licqdaemon_use_debug" = "no"; then
-  CXXFLAGS="`echo $CXXFLAGS | sed 's/-g[[^ ]]*//'`"
@@ -362 +335 @@
-])
-
+dnl @synopsis AX_BOOST([MINIMUM-VERSION])
+dnl
+dnl Test for the Boost C++ libraries of a particular version (or newer)
+dnl
+dnl If no path to the installed boost library is given the macro
+dnl searchs under /usr, /usr/local, and /opt, and evaluates the
+dnl $BOOST_ROOT environment variable. Further documentation is
+dnl available at <http://randspringer.de/boost/index.html>.
+dnl
+dnl This macro calls:
+dnl
+dnl   AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
+dnl
+dnl And sets:
+dnl
+dnl   HAVE_BOOST
+dnl
+dnl @category InstalledPackages
+dnl @category Cxx
+dnl @author Thomas Porschberg <thomas@randspringer.de>
+dnl @version 2006-06-15
+dnl @license AllPermissive
+AC_DEFUN([AX_BOOST_BASE],
+[
+AC_ARG_WITH([boost],
+  AS_HELP_STRING([--with-boost-dir@<:@=DIR@:>@], [specify boost directory (optional)]),
+  [
+    if test "$withval" = "yes"; then
+        ac_boost_path=""
+    else
+        ac_boost_path="$withval"
+    fi
+  ])
+
+  boost_lib_version_req=ifelse([$1], ,1.31.0,$1)
+  boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+  boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+  boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+  boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+  if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+    boost_lib_version_req_sub_minor="0"
+  fi
+  WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+  AC_MSG_CHECKING(for Boost >= $boost_lib_version_req)
+  succeeded=no
+
+  dnl first we check the system location for boost libraries
+  dnl this location ist chosen if boost libraries are installed with the --layout=system option
+  dnl or if you install boost with RPM
+  if test "$ac_boost_path" != ""; then
+    BOOST_LDFLAGS="-L$ac_boost_path/lib"
+    BOOST_CPPFLAGS="-I$ac_boost_path/include"
+  else
+    for ac_boost_path_tmp in /usr /usr/local /opt ; do
+      if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+        BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+        BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+        break;
+      fi
+    done
+  fi
+
+  CPPFLAGS_SAVED="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+  export CPPFLAGS
+
+  LDFLAGS_SAVED="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+  export LDFLAGS
+
+  AC_LANG_PUSH(C++)
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  @%:@include <boost/version.hpp>
+  ]], [[
+  #if BOOST_VERSION >= $WANT_BOOST_VERSION
+  // Everything is okay
+  #else
+  #  error Boost version is too old
+  #endif
+  ]])],[
+  AC_MSG_RESULT(yes)
+  succeeded=yes
+  found_system=yes
+  ],[
+  ])
+  AC_LANG_POP([C++])
+
+  dnl if we found no boost with system layout we search for boost libraries
+  dnl built and installed without the --layout=system option or for a staged(not installed) version
+  if test "x$succeeded" != "xyes"; then
+    _version=0
+    if test "$ac_boost_path" != ""; then
+      BOOST_LDFLAGS="-L$ac_boost_path/lib"
+      if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+          _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+          V_CHECK=`expr $_version_tmp \> $_version`
+          if test "$V_CHECK" = "1" ; then
+            _version=$_version_tmp
+          fi
+          VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+          BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+        done
+      fi
+    else
+      for ac_boost_path in /usr /usr/local /opt ; do
+        if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+          for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+            V_CHECK=`expr $_version_tmp \> $_version`
+            if test "$V_CHECK" = "1" ; then
+              _version=$_version_tmp
+              best_path=$ac_boost_path
+            fi
+          done
+        fi
+      done
+
+      VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+      BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+      BOOST_LDFLAGS="-L$best_path/lib"
+
+      if test "x$BOOST_ROOT" != "x"; then
+        if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
+          version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+          stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+          stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
+          V_CHECK=`expr $stage_version_shorten \>\= $_version`
+          if test "$V_CHECK" = "1" ; then
+            AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
+            BOOST_CPPFLAGS="-I$BOOST_ROOT"
+            BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
+          fi
+        fi
+      fi
+    fi
+
+    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+    export CPPFLAGS
+    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+    export LDFLAGS
+
+    AC_LANG_PUSH(C++)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+    @%:@include <boost/version.hpp>
+    ]], [[
+    #if BOOST_VERSION >= $WANT_BOOST_VERSION
+    // Everything is okay
+    #else
+    #  error Boost version is too old
+    #endif
+    ]])],[
+    AC_MSG_RESULT(yes)
+    succeeded=yes
+    found_system=yes
+    ],[
+    ])
+    AC_LANG_POP([C++])
+  fi
+
+  if test "$succeeded" != "yes" ; then
+    if test "$_version" = "0" ; then
+      AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])
+    else
+      AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])
+    fi
+  else
+    AC_SUBST(BOOST_CPPFLAGS)
+    AC_SUBST(BOOST_LDFLAGS)
+    AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+  fi
+
+  CPPFLAGS="$CPPFLAGS_SAVED"
+  LDFLAGS="$LDFLAGS_SAVED"
+])
+

trunk/licq/configure.ac

@@ -165 +165 @@
-LICQ_CHECK_GPGME
-LICQ_CHECK_OPENSSL
+AX_BOOST_BASE([1.33.1])
-
-dnl Switch to C++ mode and check for needed C++ headers