[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-odbc
Subject:    bk commit - MyODBC 3.51
From:       venu () mysql ! com
Date:       2002-12-19 6:18:42
[Download RAW message or body]

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'venu'. When 'venu' does a push, they will
be propogaged to the main repository and within 24 hours after the push
into the public repository. 

For more information on how to access the public repository see
http://www.mysql.com/products/myodbc/faq.html#Development_source

ChangeSet
  1.250 02/12/18 22:18:41 venu@myvenu.com +4 -0
  myodbc3.spec.sh:
    Rename: driver/myodbc3.spec.sh -> scripts/myodbc3.spec.sh
  configure.in, acinclude.m4:
    Fix to make the configure to work with std linux unixODBC and iODBC distro

  scripts/myodbc3.spec.sh
    1.6 02/12/18 22:17:13 venu@myvenu.com +1 -1

  scripts/Makefile.am
    1.4 02/12/18 22:17:10 venu@myvenu.com +1 -1

  scripts/myodbc3.spec.sh
    1.5 02/12/18 22:12:20 venu@myvenu.com +0 -0
    Rename: driver/myodbc3.spec.sh -> scripts/myodbc3.spec.sh

  configure.in
    1.26 02/12/18 22:11:00 venu@myvenu.com +11 -0
    Fix to make the configure to work with std linux unixODBC and iODBC distro

  acinclude.m4
    1.8 02/12/18 22:10:20 venu@myvenu.com +16 -9
    Fix to make the configure to work with std linux unixODBC and iODBC distro

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	venu
# Host:	myvenu.com
# Root:	/home/venu/work/odbc/dev-3.51

--- 1.7/acinclude.m4	Wed Dec 18 13:33:10 2002
+++ 1.8/acinclude.m4	Wed Dec 18 22:10:20 2002
@@ -56,7 +56,7 @@
 # odbc_headers manually to make AC_CHECK_ODBC_TYPE to work
 if test "x$odbc_headers" = "x"
 then
-  odbc_headers="isql.h isqlext.h"
+  odbc_headers="isql.h isqlext.h isqltypes.h"
 fi
 
 AC_CHECK_HEADERS(iodbcinst.h)
@@ -90,7 +90,7 @@
 AC_DEFUN(AC_CHECK_UNIXODBC,
 [
 CPPFLAGS="$CPPFLAGS $ODBC_FLAGS -I$1"
-AC_CHECK_HEADERS([sql.h sqlext.h odbcinst.h],
+AC_CHECK_HEADERS([sql.h sqlext.h sqltypes.h],
 [unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr"],[unixODBC_ok=no; break])
 
 if test "x$unixODBC_ok" != "xyes"
@@ -102,16 +102,23 @@
 # odbc_headers manually to make AC_CHECK_ODBC_TYPE to work
 if test "x$odbc_headers" = "x   "
 then
-  odbc_headers="sql.h sqlext.h odbcinst.h"
+  odbc_headers="sql.h sqlext.h"
 fi
 
-save_LIBS="$LIBS"
-LIBS="-L$2 $LIBS"
+AC_CHECK_HEADERS(odbcinst.h)
 
-AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
-[AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING,1,[Define if SQLGetPrivateProfileString is defined])
-LIBS="$LIBS -lodbcinst"],
-[LIBS="$save_LIBS"])
+if test "x$ac_cv_header_odbcinst_h" = "xyes"
+then
+
+  odbc_headers="$odbc_headers odbcinst.h"
+	save_LIBS="$LIBS"
+	LIBS="-L$2 $LIBS"
 
+  AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
+  [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING,1,[Define if SQLGetPrivateProfileString is defined])
+  LIBS="$LIBS -lodbcinst"
+  have_odbcinst=yes],
+  [LIBS="$save_LIBS"])
+fi   
 ])
 

--- 1.25/configure.in	Tue Dec 17 21:36:39 2002
+++ 1.26/configure.in	Wed Dec 18 22:11:00 2002
@@ -514,6 +514,17 @@
 
 AC_CHECK_UNIXODBC($unixODBC_includes,$unixODBC_libs)
 
+AC_ARG_WITH(odbc-ini,
+[  --with-odbc-ini=PATH    Location of system odbc.ini [UnixODBCDIR/etc/odbc.ini]],
+odbc_ini="$withval",odbc_ini="$unixODBC/etc/odbc.ini")
+
+if test "x$have_odbcinst" != "xyes"
+then
+  AC_DEFINE_UNQUOTED(SYSTEM_ODBC_INI,"$odbc_ini",
+                     [Define path to system wide odbc.ini file])
+fi
+
+
 else
 
 ###################################################################

--- 1.4/driver/myodbc3.spec.sh	Tue Oct 29 16:00:15 2002
+++ 1.6/scripts/myodbc3.spec.sh	Wed Dec 18 22:17:13 2002
@@ -45,7 +45,7 @@
 %files -f myodbc-filelist
 %defattr(-,root,root)
 
-%doc INSTALL
+%doc INSTALL-BINARY
 %doc ChangeLog
 %doc odbc.ini
 %doc README

--- 1.3/scripts/Makefile.am	Tue Dec 17 21:34:34 2002
+++ 1.4/scripts/Makefile.am	Wed Dec 18 22:17:10 2002
@@ -47,7 +47,7 @@
 
 all: make_binary_distribution 
 
-EXTRA_DIST = make_binary_distribution.sh
+EXTRA_DIST = make_binary_distribution.sh myodbc3.spec.sh
 
 
 

---------------------------------------------------------------------
Before posting, please check:
   http://www.mysql.com/products/myodbc/manual_toc.html (the manual)
   http://lists.mysql.com/                        (the list archive)

To unsubscribe, e-mail <myodbc-unsubscribe@lists.mysql.com>
To unsubscribe from Yahoo! Groups version, e-mail myodbc-unsubscribe@yahoogroups.com

[prev in list] [next in list] [prev in thread] [next in thread]