Update of /cvsroot/compbench/CompBenchmarks++
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16858
Modified Files:
configure.in
Log Message:
Canonical host/target definitions disabled.
CBM_LIB_VERSION added (for explicit versionning of libraries).
Custom libxml2 variables replaced by defaut ones.
Index: configure.in
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure.in 19 Sep 2007 16:29:38 -0000 1.40
--- configure.in 20 Sep 2007 19:34:01 -0000 1.41
***************
*** 12,19 ****
AC_INIT(libcompbenchmarks/Benchmark/Benchmark.cpp)
! AC_CANONICAL_HOST
! AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0)
AM_CONFIG_HEADER(libcompbenchmarks/config.h)
--- 12,23 ----
AC_INIT(libcompbenchmarks/Benchmark/Benchmark.cpp)
! # AC_CANONICAL_HOST
! # AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0)
+
+ MINOR_V=$(echo ${VERSION} | cut -f2 -d'.')
+ CBM_LIB_VERSION="${MINOR_V}:0:${MINOR_V}"
+
AM_CONFIG_HEADER(libcompbenchmarks/config.h)
***************
*** 264,269 ****
AC_SUBST(CBM_PROG_PERL)
AC_SUBST(CXXFLAGS)
! AC_SUBST(XML_CPPFLAGS)
! AC_SUBST(XML_LIBS)
AC_OUTPUT(libcompbenchmarks/share/Makefile
--- 268,272 ----
AC_SUBST(CBM_PROG_PERL)
AC_SUBST(CXXFLAGS)
! AC_SUBST(CBM_LIB_VERSION)
AC_OUTPUT(libcompbenchmarks/share/Makefile
***************
*** 308,313 ****
echo "CXX : $CXX"
echo "CXFLAGS : $CXXFLAGS"
! echo "XML_LIBS : $XML_LIBS"
! echo "XML_CPPFLAGS : $XML_CPPFLAGS"
echo ""
echo "System : $CBM_SYSTEM"
--- 311,316 ----
echo "CXX : $CXX"
echo "CXFLAGS : $CXXFLAGS"
! echo "XML_LIBS : ${XML_LIBS}"
! echo "XML_CPPFLAGS : ${XML_CPPFLAGS}"
echo ""
echo "System : $CBM_SYSTEM"
|
