Connector/ODBC 3.51 commit: r894 - in branches/guffert: installer util

[jwinstead]

Modified:
   branches/guffert/installer/Makefile.am
   branches/guffert/util/Makefile.am
Log:
Fix dependency of libmyodbc3u on MySQL client libs so we don't end up
linking the driver to both the threadsafe and non-threadsafe versions.


Modified: branches/guffert/installer/Makefile.am
===================================================================
--- branches/guffert/installer/Makefile.am	2007-11-26 20:11:52 UTC (rev 893)
+++ branches/guffert/installer/Makefile.am	2007-11-26 20:17:20 UTC (rev 894)
@@ -22,7 +22,7 @@
 
 bin_PROGRAMS = myodbc-installer
 myodbc_installer_SOURCES = myodbc3i.c
-myodbc_installer_LDADD        = ../util/libmyodbc3u.la @LTDL_LIB@ $(ODBC_DM_LIB)
+myodbc_installer_LDADD        = ../util/libmyodbc3u.la @LTDL_LIB@ @MYSQL_LIB@
$(ODBC_DM_LIB)
 myodbc_installer_DEPENDENCIES = ../util/libmyodbc3u.la
 
 # LDFLAGS=@EXTRA_LDFLAGS@

Modified: branches/guffert/util/Makefile.am
===================================================================
--- branches/guffert/util/Makefile.am	2007-11-26 20:11:52 UTC (rev 893)
+++ branches/guffert/util/Makefile.am	2007-11-26 20:17:20 UTC (rev 894)
@@ -37,7 +37,7 @@
 endif
 
 # libmysql lib deps
-libmyodbc3u_la_LIBADD         = $(LTLIBS_DEPS) @LTDL_LIB@ @MYSQL_LIB@
+libmyodbc3u_la_LIBADD         = $(LTLIBS_DEPS) @LTDL_LIB@
 libmyodbc3u_la_DEPENDENCIES   = $(LTLIBS_DEPS)
 
 EXTRA_DIST = \