From: <den...@us...> - 2010-09-06 10:28:56
|
Revision: 330 http://rmol.svn.sourceforge.net/rmol/?rev=330&view=rev Author: denis_arnaud Date: 2010-09-06 10:28:50 +0000 (Mon, 06 Sep 2010) Log Message: ----------- [Conf] Added StdAir in the configuration dependencies. Modified Paths: -------------- trunk/rmol/configure.ac trunk/rmol/rmol/core/Makefile.am Modified: trunk/rmol/configure.ac =================================================================== --- trunk/rmol/configure.ac 2010-08-21 20:09:56 UTC (rev 329) +++ trunk/rmol/configure.ac 2010-09-06 10:28:50 UTC (rev 330) @@ -113,10 +113,10 @@ # thus directly accessible within the extracppunit directory. # When that library will be widely avaible on Linux distributions, # the external reference can be removed and the following line uncommented. -#AM_PATH_EXTRACC -#AC_SUBST(EXTRACC_VERSION) -#AC_SUBST(EXTRACC_CFLAGS) -#AC_SUBST(EXTRACC_LIBS) +AM_PATH_EXTRACC +AC_SUBST(EXTRACC_VERSION) +AC_SUBST(EXTRACC_CFLAGS) +AC_SUBST(EXTRACC_LIBS) # --------------------------------------------------------- # GSL (GNU Scientific Library: http://gnu.org/projects/gsl) @@ -185,6 +185,17 @@ AC_SUBST(SOCI_CFLAGS) AC_SUBST(SOCI_LIBS) +# ----------------------------------------------------------------------------- +# Support for StdAir (): http://sf.net/projects/stdair +# ----------------------------------------------------------------------------- +# Note: the StdAir is now imported as a Subversion external reference, +# thus directly accessible within the extracppunit directory. +# When that library will be widely avaible on Linux distributions, +# the external reference can be removed and the following line uncommented. +AM_PATH_STDAIR +AC_SUBST(STDAIR_VERSION) +AC_SUBST(STDAIR_CFLAGS) +AC_SUBST(STDAIR_LIBS) # ------------------------------------------------------------------- # Support for documentation @@ -455,6 +466,11 @@ o SOCI_CFLAGS ..... : ${SOCI_CFLAGS} o SOCI_LIBS ....... : ${SOCI_LIBS} + - StdAir ........... : + o STDAIR_VERSION .. : ${STDAIR_VERSION} + o STDAIR_CFLAGS ... : ${STDAIR_CFLAGS} + o STDAIR_LIBS ..... : ${STDAIR_LIBS} + - ExtraCC ........... : o EXTRACC_VERSION . : ${EXTRACC_VERSION} o EXTRACC_CFLAGS .. : ${EXTRACC_CFLAGS} Modified: trunk/rmol/rmol/core/Makefile.am =================================================================== --- trunk/rmol/rmol/core/Makefile.am 2010-08-21 20:09:56 UTC (rev 329) +++ trunk/rmol/rmol/core/Makefile.am 2010-09-06 10:28:50 UTC (rev 330) @@ -25,3 +25,4 @@ $(BOOST_FILESYSTEM_LIB) \ $(top_builddir)/stdair/core/libstdair.la \ $(GSL_LIBS) -version-info $(GENERIC_LIBRARY_VERSION) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |