[Mockpp-commits] mockpp/config ac_cxx_boosttest.m4,1.1,1.2

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13401/config

Modified Files:
	ac_cxx_boosttest.m4 
Log Message:
fix framework dependencies 

Index: ac_cxx_boosttest.m4
===================================================================
RCS file: /cvsroot/mockpp/mockpp/config/ac_cxx_boosttest.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ac_cxx_boosttest.m4	1 Jan 2006 10:27:22 -0000	1.1
+++ ac_cxx_boosttest.m4	1 Jan 2006 19:40:36 -0000	1.2
@@ -2,7 +2,7 @@
 AC_DEFUN([EA_CHECK_BOOSTTEST],
 [
 
-AC_ARG_ENABLE(boostdir, [  --boost-dir      directory where the root of the Boost headers is located], [boostdir=NO])
+AC_ARG_ENABLE(boostdir, [  --boost-dir             directory where the root of the Boost headers is located], [boostdir=NO])
 
 boost_inc_dirs="/usr/include/boost-* /usr/local/include/boost-*"
 if test x$boostdir != xNO; then
@@ -17,7 +17,6 @@
     echo "*******************************************************"
     echo "found boost at $boost_inc"
     echo "*******************************************************"
-    EA_EXTRA_INC="$EA_EXTRA_INC -I$boost_inc"
     AC_DEFINE(HAVE_BOOSTTEST, 1, [Define if you have boost installed.])
   else
     echo "*******************************************************"
@@ -33,11 +32,6 @@
   echo "*******************************************************"
   echo "found boost test library as $boost_name at $boost_lib"
   echo "*******************************************************"
-  x=${boost_name#lib}
-  echo "x $x"
-  LIBBOOST="-l${x%.so}"
-  echo "LIBBOOST $LIBBOOST"
-  EA_EXTRA_LIB="$EA_EXTRA_LIB   -L$boost_lib"
 else
   echo "*******************************************************"
   echo "***  boost unit test framework not found."
@@ -48,13 +42,17 @@
 
 if test x$boosttest_inc != xNO; then
   if test x$enable_boosttest = xyes; then
+    x=${boost_name#lib}
+    LIBBOOST="-l${x%.so}"
+    EA_EXTRA_INC="$EA_EXTRA_INC -I$boost_inc"
+    EA_EXTRA_LIB="$EA_EXTRA_LIB   -L$boost_lib"
     echo "*******************************************************"
-    echo "**  using boosttest framework"
+    echo "**  using Boost.Test framework"
     echo "*******************************************************"
     AC_DEFINE(MOCKPP_USE_BOOSTTEST, 1, [Define to use Boost.Test as framework.])
   else
     echo "*******************************************************"
-    echo "**  NOT using boosttest framework"
+    echo "**  NOT using Boost.Test framework"
     echo "*******************************************************"
     AH_TEMPLATE(MOCKPP_USE_BOOSTTEST, [Define to use Boost.Test as framework.])
   fi