Merge remote branch 'git.eter/master'

Utilities/codegen/uniset-codegen.in

@@ -28,7 +28,7 @@ Valid options are:
   -n, --name        - filename for *_SK files (base class implementation). Default: xmlfilename_SK
   --ask             - Use 'ask' templates. See the documentation.
   --alone           - Use 'alone' templates. See the documentation.
-  --no-main         - Don`t generate main.cc
+  --no-main         - Don't generate main.cc
   
   --make-skel name  - generate process skeleton (name.src.xml, Name.cc, Name.hh, Makefile.am, main.cc)
                       Additional arguments: --no-main, --no-makefile

extensions/DBServer-MySQL/Makefile.am

@@ -7,6 +7,7 @@ UMYSQL_VER=@LIBVER@
 lib_LTLIBRARIES 			= libUniSet-mysql.la
 libUniSet_mysql_la_LDFLAGS  = -version-info $(UMYSQL_VER) 
 libUniSet_mysql_la_SOURCES	= DBInterface.cc DBServer_MySQL.cc
+libUniSet_mysql_la_CXXFLAGS = -L/usr/lib/mysql
 libUniSet_mysql_la_LIBADD	= $(top_builddir)/lib/libUniSet.la -lmysqlclient
 
 bin_PROGRAMS 					= uniset-mysql-dbserver

extensions/IOControl/Makefile.am

@@ -8,7 +8,8 @@ libUniSetIOControl_la_LDFLAGS  = -version-info $(UIO_VER)
 libUniSetIOControl_la_LIBADD		= $(COMEDI_LIBS) $(SIGC_LIBS) \
 	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
 	$(top_builddir)/lib/libUniSet.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
+	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+	-lm
 
 libUniSetIOControl_la_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
@@ -18,20 +19,21 @@ libUniSetIOControl_la_SOURCES 	= ComediInterface.cc IOControl.cc
 
 @PACKAGE@_iocontrol_LDADD 	= libUniSetIOControl.la \
 	$(top_builddir)/lib/libUniSet.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la $(COMEDI_LIBS)
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la $(COMEDI_LIBS) -lm
 @PACKAGE@_iocontrol_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
 @PACKAGE@_iocontrol_SOURCES 	= iocontrol.cc
 
 @PACKAGE@_iotest_CXXFLAGS = $(COMEDI_CFLAGS)
-@PACKAGE@_iotest_LDADD 	= $(COMEDI_LIBS)
+@PACKAGE@_iotest_LDADD 	= $(COMEDI_LIBS) -lm
 @PACKAGE@_iotest_SOURCES 	= iotest.cc
 
 @PACKAGE@_iocalibr_CXXFLAGS 	= $(COMEDI_CFLAGS)
 @PACKAGE@_iocalibr_LDADD 		= $(COMEDI_LIBS) \
 	$(top_builddir)/lib/libUniSet.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la
+	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	-lm
 @PACKAGE@_iocalibr_SOURCES 	= iocalibr.cc
 
 # install