[Dsim-svn] SF.net SVN: dsim:[26] trunk/dsim

[<den...@us...>]

Revision: 26
          http://dsim.svn.sourceforge.net/dsim/?rev=26&view=rev
Author:   denis_arnaud
Date:     2009-12-28 18:24:08 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
[Test] Activated the embedded ExtraCC library, and added the RMOL test sub-directory.

Modified Paths:
--------------
    trunk/dsim/Makefile.am
    trunk/dsim/configure.ac
    trunk/dsim/test/Makefile.am

Property Changed:
----------------
    trunk/dsim/


Property changes on: trunk/dsim
___________________________________________________________________
Modified: svn:externals
   - stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm


   + stdair https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/stdair
trademgen https://trademgen.svn.sourceforge.net/svnroot/trademgen/trunk/trademgen/trademgen
airsched https://air-sched.svn.sourceforge.net/svnroot/air-sched/trunk/airsched/airsched
avlcal https://avlcal.svn.sourceforge.net/svnroot/avlcal/trunk/avlcal/avlcal
airinv https://airinv.svn.sourceforge.net/svnroot/airinv/trunk/airinv/airinv
simfqt https://simfqt.svn.sourceforge.net/svnroot/simfqt/trunk/simfqt/simfqt
simcrs https://simcrs.svn.sourceforge.net/svnroot/simcrs/trunk/simcrs/simcrs
rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/rmol
travelccm https://travel-ccm.svn.sourceforge.net/svnroot/travel-ccm/trunk/travelccm/travelccm
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit



Modified: trunk/dsim/Makefile.am
===================================================================
--- trunk/dsim/Makefile.am	2009-12-28 15:16:19 UTC (rev 25)
+++ trunk/dsim/Makefile.am	2009-12-28 18:24:08 UTC (rev 26)
@@ -25,7 +25,8 @@
 EXTRA_DIST =
 
 # Build in these directories:
-SUBDIRS = stdair trademgen airsched airinv simcrs rmol dsim $(TEST_DIR)
+SUBDIRS = stdair trademgen airsched airinv simcrs rmol dsim \
+	extracppunit $(TEST_DIR)
 
 
 # Configuration helpers

Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac	2009-12-28 15:16:19 UTC (rev 25)
+++ trunk/dsim/configure.ac	2009-12-28 18:24:08 UTC (rev 26)
@@ -141,7 +141,11 @@
 # -----------------------------------------------------------------------------
 # Support for ExtraCC (Extra-CruiseControl): http://sf.net/projects/extracc
 # -----------------------------------------------------------------------------
-AM_PATH_EXTRACC
+# Note: the ExtraCC 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_EXTRACC
 #AC_SUBST(EXTRACC_VERSION)
 #AC_SUBST(EXTRACC_CFLAGS)
 #AC_SUBST(EXTRACC_LIBS)
@@ -199,14 +203,6 @@
 AC_SUBST(BOOST_MPI_PYTHON_LIB)
 
 # --------------------------------------------------------------------
-# Support for MySQL++ (C++ client API): http://tangentsoft.net/mysql++
-# --------------------------------------------------------------------
-AX_MYSQLPP
-AC_SUBST(MYSQLPP_VERSION)
-AC_SUBST(MYSQLPP_CFLAGS)
-AC_SUBST(MYSQLPP_LIBS)
-
-# --------------------------------------------------------------------
 # Support for SOCI http://soci.sourceforge.net
 # --------------------------------------------------------------------
 AX_SOCI
@@ -217,18 +213,22 @@
 # --------------------------------------------------------------------
 # Support for TRAVEL-CCM (CCM Open Library): http://sf.net/projects/travel-ccm
 # --------------------------------------------------------------------
-AM_PATH_TRAVELCCM
-AC_SUBST(TRAVELCCM_VERSION)
-AC_SUBST(TRAVELCCM_CFLAGS)
-AC_SUBST(TRAVELCCM_LIBS)
+# Note: That library is imported as a Subversion external reference. So, there is
+#       no need to import it as an independent library as well.
+#AM_PATH_TRAVELCCM
+#AC_SUBST(TRAVELCCM_VERSION)
+#AC_SUBST(TRAVELCCM_CFLAGS)
+#AC_SUBST(TRAVELCCM_LIBS)
 
 # --------------------------------------------------------------------
 # Support for RMOL (RM Open Library): http://sf.net/projects/rmol
 # --------------------------------------------------------------------
-AM_PATH_RMOL([0.19])
-AC_SUBST(RMOL_VERSION)
-AC_SUBST(RMOL_CFLAGS)
-AC_SUBST(RMOL_LIBS)
+# Note: That library is imported as a Subversion external reference. So, there is
+#       no need to import it as an independent library as well.
+#AM_PATH_RMOL([0.19])
+#AC_SUBST(RMOL_VERSION)
+#AC_SUBST(RMOL_CFLAGS)
+#AC_SUBST(RMOL_LIBS)
 
 # ============ X E R C E S ==================
 AX_XERCES_C
@@ -238,14 +238,6 @@
 #
 AC_CHECK_LIBRT
 
-# -----------------------------------------------------------
-# Xapian (Indexing & Search API: http://www.xapian.org
-# -----------------------------------------------------------
-XO_LIB_XAPIAN
-AC_SUBST(XAPIAN_VERSION)
-AC_SUBST(XAPIAN_CFLAGS)
-AC_SUBST(XAPIAN_LIBS)
-
 # -------------------------------------------------------------------
 # Support for documentation
 # -------------------------------------------------------------------
@@ -463,6 +455,7 @@
 	dsim/config/Makefile
 	dsim/core/Makefile
 	dsim/batches/Makefile
+	extracppunit/Makefile
 	test/Makefile
 	test/boost/Makefile
 	test/boost/accumulators/Makefile
@@ -561,11 +554,6 @@
     o MYSQL_CFLAGS .... : ${MYSQL_CFLAGS}
     o MYSQL_LIBS ...... : ${MYSQL_LIBS} 
 
-  - MySQL++ ........... :
-    o MYSQLPP_version . : ${MYSQLPP_VERSION}
-    o MYSQLPP_CFLAGS .. : ${MYSQLPP_CFLAGS}
-    o MYSQLPP_LIBS .... : ${MYSQLPP_LIBS}
-
   - SOCI .............. :	
     o SOCI_version .... : ${SOCI_VERSION}
     o SOCI_CFLAGS ..... : ${SOCI_CFLAGS}
@@ -576,26 +564,6 @@
     o XERCES_CFLAGS ... : ${XERCES_CFLAGS}
     o XERCES_LIBS ..... : ${XERCES_LIBS}
 
-  - EXTRACC ........... :
-    o EXTRACC_VERSION . : ${EXTRACC_VERSION}
-    o EXTRACC_CFLAGS .. : ${EXTRACC_CFLAGS}
-    o EXTRACC_LIBS .... : ${EXTRACC_LIBS}
-
-  - TRAVELCCM ......... :
-    o TRAVELCCM_VERSION : ${TRAVELCCM_VERSION}
-    o TRAVELCCM_CFLAGS  : ${TRAVELCCM_CFLAGS}
-    o TRAVELCCM_LIBS .. : ${TRAVELCCM_LIBS}
-
-  - RMOL .............. :
-    o RMOL_VERSION .... : ${RMOL_VERSION}
-    o RMOL_CFLAGS ..... : ${RMOL_CFLAGS}
-    o RMOL_LIBS ....... : ${RMOL_LIBS}
-
-  - XAPIAN ............ :
-    o XAPIAN_VERSION .. : ${XAPIAN_VERSION}
-    o XAPIAN_CFLAGS ... : ${XAPIAN_CFLAGS}
-    o XAPIAN_LIBS ..... : ${XAPIAN_LIBS}
-
  - CPPUNIT............ :
     o CPPUNIT_VERSION . : ${CPPUNIT_VERSION}
     o CPPUNIT_CFLAGS .. : ${CPPUNIT_CFLAGS}

Modified: trunk/dsim/test/Makefile.am
===================================================================
--- trunk/dsim/test/Makefile.am	2009-12-28 15:16:19 UTC (rev 25)
+++ trunk/dsim/test/Makefile.am	2009-12-28 18:24:08 UTC (rev 26)
@@ -4,7 +4,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 ##
-SUBDIRS = boost
+SUBDIRS = boost rmol
 
 ##
 check_PROGRAMS = simulate


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.