[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8899 - in gnuradio/branches/developers/eb/sched-wip:
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r8899 - in gnuradio/branches/developers/eb/sched-wip: . config |
|
Date: |
Tue, 15 Jul 2008 21:30:50 -0600 (MDT) |
Author: eb
Date: 2008-07-15 21:30:47 -0600 (Tue, 15 Jul 2008)
New Revision: 8899
Modified:
gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
gnuradio/branches/developers/eb/sched-wip/configure.ac
Log:
cleanup of ax_boost_base.m4
Modified: gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0
2008-07-16 02:04:19 UTC (rev 8898)
+++ gnuradio/branches/developers/eb/sched-wip/README.building-boost-1.35.0
2008-07-16 03:30:47 UTC (rev 8899)
@@ -10,16 +10,6 @@
$ BOOST_PREFIX=/opt/boost_1_35_0
$ ./configure --prefix=$BOOST_PREFIX --with-libraries=thread,date_time
-
-# IMPORTANT!!!! Edit the generated Makefile!
-# Find the line that contains BJAM_CONFIG and make it read:
-
- BJAM_CONFIG= --layout=system
-
-# If you don't do this boost will get installed with really screwy paths.
-
-# Now that you're done editing the Makefile as instructed above...
-
$ make
$ make install
Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
2008-07-16 02:04:19 UTC (rev 8898)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_base.m4
2008-07-16 03:30:47 UTC (rev 8899)
@@ -30,6 +30,7 @@
# COPYLEFT
#
# Copyright (c) 2008 Thomas Porschberg <address@hidden>
+# Copyright (c) 2008 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
@@ -37,8 +38,10 @@
AC_DEFUN([AX_BOOST_BASE],
[
+AC_REQUIRE([GR_LIB64])
AC_ARG_WITH([boost],
- AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) -
it is possible to specify the root directory for boost (optional)]),
+ AS_HELP_STRING([--with-boost@<:@=DIR@:>@],
+ [use boost (default is yes) - it is possible to specify the
root directory for boost (optional)]),
[
if test "$withval" = "no"; then
want_boost="no"
@@ -55,7 +58,10 @@
AC_ARG_WITH([boost-libdir],
AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
- [Force given directory for boost libraries. Note that this will
overwrite library path detection, so use this parameter only if default library
detection fails and you know exactly where your boost libraries are located.]),
+ [Force given directory for boost libraries. Note that
this
+ will overwrite library path detection, so use this
parameter
+ only if default library detection fails and you know
exactly
+ where your boost libraries are located.]),
[
if test -d $withval
then
@@ -77,19 +83,31 @@
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 boostlib >= $boost_lib_version_req)
+ 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"
+ dnl Look first where we think they ought to be, accounting for a
possible "64" suffix on lib.
+ dnl If that directory doesn't exist, fall back to the default behavior
+ if test -d "$ac_boost_path/lib${gr_libdir_suffix}"; then
+ BOOST_LDFLAGS="-L$ac_boost_path/lib${gr_libdir_suffix}"
+ else
+ BOOST_LDFLAGS="-L$ac_boost_path/lib"
+ fi
BOOST_CPPFLAGS="-I$ac_boost_path/include"
else
for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; 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"
+ dnl Look first where we think they ought to be, accounting for
a possible "64" suffix on lib.
+ dnl If that directory doesn't exist, fall back to the default
behavior
+ if test -d "$ac_boost_path_tmp/lib${gr_libdir_suffix}"; then
+ BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib${gr_libdir_suffix}"
+ else
+ BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+ fi
BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
break;
fi
@@ -119,66 +137,50 @@
#else
# error Boost version is too old
#endif
- ]])],[
- AC_MSG_RESULT(yes)
- succeeded=yes
- found_system=yes
- ],[
- ])
+ ]])],[AC_MSG_RESULT(yes)
+ succeeded=yes
+ found_system=yes
+ ],
+ [])
AC_LANG_POP([C++])
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
-
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
+ dnl built and installed without the --layout=system option
+ if test "$succeeded" != "yes"; then
_version=0
+
if test "$ac_boost_path" != ""; then
- 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/_/./'`
+ path_list="$ac_boost_path"
+ else
+ path_list="/usr /usr/local /opt /opt/local"
+ fi
+ for ac_boost_path in $path_list ; 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
- fi
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+ best_path=$ac_boost_path
+ fi
done
fi
- else
- for ac_boost_path in /usr /usr/local /opt /opt/local ; 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
+ done
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
- if test "$ac_boost_lib_path" = ""
- then
- BOOST_LDFLAGS="-L$best_path/lib"
- fi
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+ BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
- 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" -a "$ac_boost_lib_path" = "" ;
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
+ if test "$ac_boost_lib_path" = ""; then
+ dnl Look first where we think they ought to be, accounting for a
possible "64" suffix on lib.
+ dnl If that directory doesn't exist, fall back to the default
behavior
+ if test -d "$best_path/lib${gr_libdir_suffix}"; then
+ BOOST_LDFLAGS="-L$best_path/lib${gr_libdir_suffix}"
+ else
+ BOOST_LDFLAGS="-L$best_path/lib"
+ fi
fi
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
@@ -195,29 +197,28 @@
#else
# error Boost version is too old
#endif
- ]])],[
- AC_MSG_RESULT(yes)
- succeeded=yes
- found_system=yes
- ],[
- ])
+ ]])],[AC_MSG_RESULT(yes)
+ succeeded=yes
+ found_system=yes
+ ],
+ [])
AC_LANG_POP([C++])
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
if test "$succeeded" != "yes" ; then
+ AC_MSG_RESULT([no])
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.]])
+ AC_MSG_ERROR([[we could not detect the boost libraries (version
$boost_lib_version_req_shorten or higher).
+If you are sure you have boost installed, then check your version number
looking in <boost/version.hpp>.]])
else
- AC_MSG_NOTICE([Your boost libraries seems to old (version
$_version).])
+ AC_MSG_ERROR([your boost libraries seem 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"
fi
-
])
Modified: gnuradio/branches/developers/eb/sched-wip/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/configure.ac 2008-07-16
02:04:19 UTC (rev 8898)
+++ gnuradio/branches/developers/eb/sched-wip/configure.ac 2008-07-16
03:30:47 UTC (rev 8899)
@@ -228,8 +228,9 @@
dnl
dnl calls AC_SUBST(BOOST_CPPFLAGS) and AC_SUBST(BOOST_LDFLAGS)
dnl and sets HAVE_BOOST
-AX_BOOST_BASE([1.35.0])
+AX_BOOST_BASE([1.35])
+
dnl calls AC_SUBST(BOOST_THREAD_LIB)
dnl and sets HAVE_BOOST_THREAD
AX_BOOST_THREAD
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8899 - in gnuradio/branches/developers/eb/sched-wip: . config,
eb <=