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

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

Revision: 25
          http://dsim.svn.sourceforge.net/dsim/?rev=25&view=rev
Author:   denis_arnaud
Date:     2009-12-28 15:16:19 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
[Conf] Suppressed useless dependencies on SOCI and MySQL.

Modified Paths:
--------------
    trunk/dsim/config/mysql.m4
    trunk/dsim/config/soci.m4
    trunk/dsim/configure.ac
    trunk/dsim/dsim/bom/Makefile.am
    trunk/dsim/test/Makefile.am

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

Modified: trunk/dsim/config/mysql.m4
===================================================================
--- trunk/dsim/config/mysql.m4	2009-12-28 10:52:19 UTC (rev 24)
+++ trunk/dsim/config/mysql.m4	2009-12-28 15:16:19 UTC (rev 25)
@@ -113,10 +113,10 @@
 
 		AC_MSG_RESULT([$MYSQL_libdir])
 
-		case "$MYSQL_libdir" in
-		  /usr/lib) ;;
-		  *) LDFLAGS="$LDFLAGS -L${MYSQL_libdir}" ;;
-		esac
+#		case "$MYSQL_libdir" in
+#		  /usr/lib) ;;
+#		  *) LDFLAGS="$LDFLAGS -L${MYSQL_libdir}" ;;
+#		esac
 
 		#
 		# Look for MySQL C API headers

Modified: trunk/dsim/config/soci.m4
===================================================================
--- trunk/dsim/config/soci.m4	2009-12-28 10:52:19 UTC (rev 24)
+++ trunk/dsim/config/soci.m4	2009-12-28 15:16:19 UTC (rev 25)
@@ -79,10 +79,10 @@
 
 	AC_MSG_RESULT([$SOCI_libdir])
 
-	case "$SOCI_libdir" in
-	  /usr/lib) ;;
-	  *) LDFLAGS="$LDFLAGS -L${SOCI_libdir}" ;;
-	esac
+#	case "$SOCI_libdir" in
+#	  /usr/lib) ;;
+#	  *) LDFLAGS="$LDFLAGS -L${SOCI_libdir}" ;;
+#	esac
 
 
 	#
@@ -119,8 +119,8 @@
 	then
 		SOCI_LIBS="-L${SOCI_libdir}"
 	fi
-	SOCI_CFLAGS="-DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED $SOCI_CFLAGS"
-	SOCI_LIBS="$SOCI_LIBS -l${SOCI_CORE_LIB} -l${SOCI_MYSQL_LIB} -ldl"
+	SOCI_CFLAGS="-DSOCI_HEADERS_BURIED -DSOCI_MYSQL_HEADERS_BURIED ${MYSQL_CFLAGS} ${SOCI_CFLAGS}"
+	SOCI_LIBS="${MYSQL_LIBS} ${SOCI_LIBS} -l${SOCI_CORE_LIB} -l${SOCI_MYSQL_LIB} -ldl"
 	AC_SUBST(SOCI_CFLAGS)
 	AC_SUBST(SOCI_LIBS)
 

Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac	2009-12-28 10:52:19 UTC (rev 24)
+++ trunk/dsim/configure.ac	2009-12-28 15:16:19 UTC (rev 25)
@@ -475,6 +475,7 @@
 	test/boost/spirit/Makefile
 	test/boost/serialization/Makefile
 	test/boost/signals/Makefile
+	test/rmol/Makefile
 )
 AC_OUTPUT
 

Modified: trunk/dsim/dsim/bom/Makefile.am
===================================================================
--- trunk/dsim/dsim/bom/Makefile.am	2009-12-28 10:52:19 UTC (rev 24)
+++ trunk/dsim/dsim/bom/Makefile.am	2009-12-28 15:16:19 UTC (rev 25)
@@ -5,8 +5,8 @@
 noinst_LTLIBRARIES= libbom.la
 
 libbom_la_SOURCES= $(bom_h_sources) $(bom_cc_sources) 
-libbom_la_CXXFLAGS = $(GSL_CFLAGS)
-libbom_la_LDFLAGS = $(GSL_LIBS)
+libbom_la_CXXFLAGS =
+libbom_la_LDFLAGS =
 
 #pkgincludedir = $(includedir)/@PACKAGE@/bom
 #pkginclude_HEADERS = $(bom_h_sources)


Property changes on: trunk/dsim/test
___________________________________________________________________
Added: svn:externals
   + rmol https://rmol.svn.sourceforge.net/svnroot/rmol/trunk/rmol/test/rmol



Modified: trunk/dsim/test/Makefile.am
===================================================================
--- trunk/dsim/test/Makefile.am	2009-12-28 10:52:19 UTC (rev 24)
+++ trunk/dsim/test/Makefile.am	2009-12-28 15:16:19 UTC (rev 25)
@@ -17,12 +17,12 @@
 #SimulationTestSuite_LDADD = $(top_builddir)/test/com/libcppunitcore.la
 #SimulationTestSuite_LDFLAGS = \
 #		$(BOOST_LIBS) $(CPPUNIT_LIBS) \
-#		$(top_builddir)/@PACKAGE@/lib@PACKAGE@.la
+#		$(top_builddir)/dsim/libdsim.la
 
 simulate_SOURCES = simulate.cpp
 simulate_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
 simulate_LDADD =
 simulate_LDFLAGS = $(BOOST_LIBS) \
-		$(top_builddir)/@PACKAGE@/core/lib@PACKAGE@.la
+		$(top_builddir)/dsim/core/libdsim.la
 
 EXTRA_DIST =


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