Connector/ODBC 3.51 commit: r878 - branches/guffert/installer

[jbalint]

Modified:
   branches/guffert/installer/Makefile.am
   branches/guffert/installer/myodbc3i.c
Log:
fixes to myodbc-installer build on unix


Modified: branches/guffert/installer/Makefile.am
===================================================================
--- branches/guffert/installer/Makefile.am	2007-11-19 21:10:00 UTC (rev 877)
+++ branches/guffert/installer/Makefile.am	2007-11-19 21:54:20 UTC (rev 878)
@@ -18,15 +18,13 @@
 
 if MYODBCINST
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/util
 
 bin_PROGRAMS = myodbc-installer
-myodbc3i_SOURCES = myodbc3i.c
-myodbc3i_LDADD        = ../util/libmyodbc3u.la @LTDL_LIB@
-myodbc3i_DEPENDENCIES = ../util/libmyodbc3u.la
+myodbc_installer_SOURCES = myodbc3i.c
+myodbc_installer_LDADD        = ../util/libmyodbc3u.la @LTDL_LIB@ $(ODBC_DM_LIB)
+myodbc_installer_DEPENDENCIES = ../util/libmyodbc3u.la
 
-INCLUDES=-I.. -I../util
-
 # LDFLAGS=@EXTRA_LDFLAGS@
 
 endif

Modified: branches/guffert/installer/myodbc3i.c
===================================================================
--- branches/guffert/installer/myodbc3i.c	2007-11-19 21:10:00 UTC (rev 877)
+++ branches/guffert/installer/myodbc3i.c	2007-11-19 21:54:20 UTC (rev 878)
@@ -37,6 +37,11 @@
  * driver and data source entries in the system. See usage text for details.
  */
 
+#include "MYODBC_MYSQL.h"
+#include "MYODBC_CONF.h"
+#include "installer.h"
+#include "stringutil.h"
+
 #ifdef _WIN32
 #   include <windows.h>
 #endif
@@ -48,11 +53,6 @@
 #include <sqlext.h>
 #include <odbcinst.h>
 
-#include "installer.h"
-#include "stringutil.h"
-#include "VersionInfo.h"
-#include "MYODBC_MYSQL.h"
-
 const char *usage =
 "+---                                                                   \n"
 "| myodbc3i v" MYODBC_VERSION "                                         \n"
@@ -678,7 +678,7 @@
     case OPT_SCOPE:
       /* convert to integer */
       scope= *(++arg) - '0';
-      if (scope < 0 || scope > 2 || *(arg + 1) /* another char exists */)
+      if (scope > 2 || *(arg + 1) /* another char exists */)
       {
         fprintf(stderr, "[ERROR] Invalid scope: %s\n", arg);
         return 1;