Changeset 9410

Show
Ignore:
Timestamp:
08/25/08 15:18:30
Author:
eb
Message:

Pick up new boost macros from gnuradio

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • usrp2/trunk/host-ng/config/pkg.m4

    r6955 r9410  
    22#  
    33# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 
     4# Copyright © 2008 Free Software Foundation, Inc. 
    45# 
    56# This program is free software; you can redistribute it and/or modify 
    …… 
    9798# E.g., 
    9899#   PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) 
    99 #   defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page 
    100 #   also defines GSTUFF_PKG_ERRORS on error 
     100#   defines: 
     101# 
     102#     GSTUFF_LIBS 
     103#     GSTUFF_CFLAGS 
     104#     GSTUFF_INCLUDEDIR 
     105#     GSTUFF_CPPFLAGS    # the -I, -D and -U's out of CFLAGS 
     106# 
     107# see pkg-config man page also defines GSTUFF_PKG_ERRORS on error 
    101108# 
    102109# Note that if there is a possibility the first call to 
    …… 
    109116AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl 
    110117AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl 
     118AC_ARG_VAR([$1][_INCLUDEDIR], [includedir for $1, overriding pkg-config])dnl 
    111119 
    112120pkg_failed=no 
    …… 
    121129  _PKG_CONFIG([$1][_LIBS], [libs --static], [$2]) 
    122130fi 
     131 
     132_PKG_CONFIG([$1][_INCLUDEDIR], [variable=includedir], [$2]) 
     133 
    123134 
    124135m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS 
    …… 
    161172        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS 
    162173        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS 
     174        $1[]_INCLUDEDIR=$pkg_cv_[]$1[]_INCLUDEDIR 
     175 
     176        $1[]_CPPFLAGS="" 
     177        for flag in $$1[]_CFLAGS; do 
     178          case $flag in 
     179          -I* | -D* | -U*) $1[]_CPPFLAGS="$$1[]_CPPFLAGS $flag" ;; 
     180          esac 
     181        done 
     182        pkg_cv_[]$1[]_CPPFLAGS=$$1[]_CPPFLAGS 
     183        AC_SUBST($1[]_CPPFLAGS) 
     184 
    163185        AC_MSG_RESULT([yes]) 
    164186        ifelse([$3], , :, [$3]) 

  • usrp2/trunk/host-ng/configure.ac

    r9142 r9410  
    145145 
    146146AH_BOTTOM([ 
     147#ifdef __cplusplus 
     148extern "C" { 
     149#endif 
     150 
    147151#ifndef HAVE_TRUNC 
    148152#include <math.h> 
    …… 
    158162{ 
    159163  return pow(10.0, x); 
     164} 
     165#endif 
     166 
     167#ifdef __cplusplus 
    160168} 
    161169#endif 
    …… 
    196204AC_SUBST(CPPUNIT_INCLUDES) 
    197205 
    198 dnl Define where to find boost includes 
    199 dnl defines BOOST_CFLAGS 
    200 GR_REQUIRE_BOOST_INCLUDES 
     206dnl AX_BOOST_BASE finds the headers and the lib dir (-L<foo>) 
     207dnl 
     208dnl calls AC_SUBST(BOOST_CPPFLAGS), AC_SUBST(BOOST_LDFLAGS) and defines HAVE_BOOST 
     209AX_BOOST_BASE([1.35]) 
    201210 
    202211dnl so we can use some utilities. FIXME hoist them out