Re: odbc patches

I'm confused. What do --with-unixODBC-includes and --with-unixODBC-libs do
that --with-includes and --with-libraries wouldn't? Wouldn't it be enough
to have --with-unixodbc?

Bruce Momjian writes:

Sorry. Found your nice diff. Applied. Thanks.

Hello.

I have made the couple of mods required to make the odbc driver with
postgres build and use unixODBC (http://www.unixodbc.org)

This patch was applied against the postgresql-7.0beta1 build

Any problems let me know.

Nick Gorham

Only in .: pg-beta-unixODBC.patch
diff -c -r -p1 ../pgsql/src/configure.in ./src/configure.in
*** ../pgsql/src/configure.in	Mon Feb 21 08:00:25 2000
--- ./src/configure.in	Thu Mar  2 16:42:40 2000
*************** AC_SUBST(ODBCINSTDIR)
*** 391,392 ****
--- 391,434 ----

+ #check for unixODBC
+ 
+ use_unixODBC=no
+ AC_ARG_WITH(unixODBC,
+ [  --with-unixODBC[=DIR]   Use unixODBC located in DIR],
+ [use_unixODBC=yes;unixODBC="$withval"],use_unixODBC=no)
+ 
+ if test "x$use_unixODBC" = "xyes"
+ then
+ 
+ # default to /usr if not specified
+ if test "x$unixODBC" = "x"
+ then
+     unixODBC="/usr";
+ fi
+ 
+ AC_ARG_WITH(unixODBC-includes,
+     [  --with-unixODBC-includes=DIR Find unixODBC headers in DIR],
+     unixODBC_includes="$withval",unixODBC_includes="$unixODBC/include")
+ 
+     AC_ARG_WITH(unixODBC-libs,
+     [  --with-unixODBC-libs=DIR Find unixODBC libraries in DIR],
+     unixODBC_libs="$withval",unixODBC_libs="$unixODBC/lib")
+ 
+     CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
+     AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
+         unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr",unixODBC_ok=no; break)
+ 
+ if test "x$unixODBC_ok" != "xyes"
+ then
+     AC_MSG_ERROR([Unable to find the unixODBC headers in $1])
+ fi
+ 
+ save_LIBS="$LIBS"
+ LIBS="-L$unixODBC_libs $LIBS"
+ 
+ AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
+ [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
+ LIBS="$LIBS -lodbcinst"],
+ [LIBS="$save_LIBS"])
+ fi
+ 
dnl Unless we specify the command line options
diff -c -r -p1 ../pgsql/src/include/config.h.in ./src/include/config.h.in
*** ../pgsql/src/include/config.h.in	Mon Feb 21 08:00:25 2000
--- ./src/include/config.h.in	Thu Mar  2 16:42:58 2000
***************
*** 310,311 ****
--- 310,314 ----

+ /* are we building against a libodbcinst */
+ #undef HAVE_SQLGETPRIVATEPROFILESTRING
+ 
/* Set to 1 if you have <pwd.h> */
diff -c -r -p1 ../pgsql/src/interfaces/odbc/dlg_specific.c ./src/interfaces/odbc/dlg_specific.c
*** ../pgsql/src/interfaces/odbc/dlg_specific.c	Tue Nov 30 08:00:26 1999
--- ./src/interfaces/odbc/dlg_specific.c	Thu Mar  2 16:43:40 2000
***************
*** 25,28 ****
--- 25,30 ----
#include "gpps.h"
+ #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
+ #endif
#ifndef HAVE_STRICMP
diff -c -r -p1 ../pgsql/src/interfaces/odbc/misc.h ./src/interfaces/odbc/misc.h
*** ../pgsql/src/interfaces/odbc/misc.h	Thu Dec 31 00:26:44 1998
--- ./src/interfaces/odbc/misc.h	Thu Mar  2 16:43:23 2000
***************
*** 17,20 ****
#ifndef WIN32
! #include "gpps.h"
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#endif
--- 17,21 ----
#ifndef WIN32
! #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
+ #endif
#endif

--
Peter Eisentraut Sernanders v�g 10:115
peter_e@gmx.net 75262 Uppsala
http://yi.org/peter-e/ Sweden

Beats me. Maybe the author can comment?

[ Charset ISO-8859-1 unsupported, converting... ]

I'm confused. What do --with-unixODBC-includes and --with-unixODBC-libs do
that --with-includes and --with-libraries wouldn't? Wouldn't it be enough
to have --with-unixodbc?

Bruce Momjian writes:

Sorry. Found your nice diff. Applied. Thanks.

Hello.

I have made the couple of mods required to make the odbc driver with
postgres build and use unixODBC (http://www.unixodbc.org)

This patch was applied against the postgresql-7.0beta1 build

Any problems let me know.

Nick Gorham

Only in .: pg-beta-unixODBC.patch
diff -c -r -p1 ../pgsql/src/configure.in ./src/configure.in
*** ../pgsql/src/configure.in	Mon Feb 21 08:00:25 2000
--- ./src/configure.in	Thu Mar  2 16:42:40 2000
*************** AC_SUBST(ODBCINSTDIR)
*** 391,392 ****
--- 391,434 ----

+ #check for unixODBC
+ 
+ use_unixODBC=no
+ AC_ARG_WITH(unixODBC,
+ [  --with-unixODBC[=DIR]   Use unixODBC located in DIR],
+ [use_unixODBC=yes;unixODBC="$withval"],use_unixODBC=no)
+ 
+ if test "x$use_unixODBC" = "xyes"
+ then
+ 
+ # default to /usr if not specified
+ if test "x$unixODBC" = "x"
+ then
+     unixODBC="/usr";
+ fi
+ 
+ AC_ARG_WITH(unixODBC-includes,
+     [  --with-unixODBC-includes=DIR Find unixODBC headers in DIR],
+     unixODBC_includes="$withval",unixODBC_includes="$unixODBC/include")
+ 
+     AC_ARG_WITH(unixODBC-libs,
+     [  --with-unixODBC-libs=DIR Find unixODBC libraries in DIR],
+     unixODBC_libs="$withval",unixODBC_libs="$unixODBC/lib")
+ 
+     CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
+     AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
+         unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr",unixODBC_ok=no; break)
+ 
+ if test "x$unixODBC_ok" != "xyes"
+ then
+     AC_MSG_ERROR([Unable to find the unixODBC headers in $1])
+ fi
+ 
+ save_LIBS="$LIBS"
+ LIBS="-L$unixODBC_libs $LIBS"
+ 
+ AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
+ [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
+ LIBS="$LIBS -lodbcinst"],
+ [LIBS="$save_LIBS"])
+ fi
+ 
dnl Unless we specify the command line options
diff -c -r -p1 ../pgsql/src/include/config.h.in ./src/include/config.h.in
*** ../pgsql/src/include/config.h.in	Mon Feb 21 08:00:25 2000
--- ./src/include/config.h.in	Thu Mar  2 16:42:58 2000
***************
*** 310,311 ****
--- 310,314 ----

+ /* are we building against a libodbcinst */
+ #undef HAVE_SQLGETPRIVATEPROFILESTRING
+ 
/* Set to 1 if you have <pwd.h> */
diff -c -r -p1 ../pgsql/src/interfaces/odbc/dlg_specific.c ./src/interfaces/odbc/dlg_specific.c
*** ../pgsql/src/interfaces/odbc/dlg_specific.c	Tue Nov 30 08:00:26 1999
--- ./src/interfaces/odbc/dlg_specific.c	Thu Mar  2 16:43:40 2000
***************
*** 25,28 ****
--- 25,30 ----
#include "gpps.h"
+ #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
+ #endif
#ifndef HAVE_STRICMP
diff -c -r -p1 ../pgsql/src/interfaces/odbc/misc.h ./src/interfaces/odbc/misc.h
*** ../pgsql/src/interfaces/odbc/misc.h	Thu Dec 31 00:26:44 1998
--- ./src/interfaces/odbc/misc.h	Thu Mar  2 16:43:23 2000
***************
*** 17,20 ****
#ifndef WIN32
! #include "gpps.h"
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#endif
--- 17,21 ----
#ifndef WIN32
! #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
+ #endif
#endif

--
Peter Eisentraut Sernanders v?g 10:115
peter_e@gmx.net 75262 Uppsala
http://yi.org/peter-e/ Sweden

-- 
  Bruce Momjian                        |  http://www.op.net/~candle
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026

Bruce Momjian wrote:

Beats me. Maybe the author can comment?

[ Charset ISO-8859-1 unsupported, converting... ]

I'm confused. What do --with-unixODBC-includes and --with-unixODBC-libs do
that --with-includes and --with-libraries wouldn't? Wouldn't it be enough
to have --with-unixodbc?

Yes, its not as good as it could be, I will sort it out this morning, Is there a anon CVS server I can
use to get the current state, or should I provide patches against a know version + my last (old) changes
?
--
Nick Gorham, nick@lurcher.org
"They laughed at Galileo. They laughed at Newton.
But they also laughed at Bozo the Clown." -- Carl Sagan.

On Mon, 12 Jun 2000, Nick Gorham wrote:

Yes, its not as good as it could be, I will sort it out this morning,
Is there a anon CVS server I can use to get the current state,

See <http://www.postgresql.org/docs/programmer/cvs.htm&gt;.

--
Peter Eisentraut Sernanders v�g 10:115
peter_e@gmx.net 75262 Uppsala
http://yi.org/peter-e/ Sweden

Sorry, I'm going to have to remove this. It breaks the build for those
*not* using unixODBC. (Nice marketing move, but really... :)

Bruce Momjian writes:

Sorry. Found your nice diff. Applied. Thanks.

Hello.

I have made the couple of mods required to make the odbc driver with
postgres build and use unixODBC (http://www.unixodbc.org)

This patch was applied against the postgresql-7.0beta1 build

Any problems let me know.

Nick Gorham

Only in .: pg-beta-unixODBC.patch
diff -c -r -p1 ../pgsql/src/configure.in ./src/configure.in
*** ../pgsql/src/configure.in	Mon Feb 21 08:00:25 2000
--- ./src/configure.in	Thu Mar  2 16:42:40 2000
*************** AC_SUBST(ODBCINSTDIR)
*** 391,392 ****
--- 391,434 ----

+ #check for unixODBC
+ 
+ use_unixODBC=no
+ AC_ARG_WITH(unixODBC,
+ [  --with-unixODBC[=DIR]   Use unixODBC located in DIR],
+ [use_unixODBC=yes;unixODBC="$withval"],use_unixODBC=no)
+ 
+ if test "x$use_unixODBC" = "xyes"
+ then
+ 
+ # default to /usr if not specified
+ if test "x$unixODBC" = "x"
+ then
+     unixODBC="/usr";
+ fi
+ 
+ AC_ARG_WITH(unixODBC-includes,
+     [  --with-unixODBC-includes=DIR Find unixODBC headers in DIR],
+     unixODBC_includes="$withval",unixODBC_includes="$unixODBC/include")
+ 
+     AC_ARG_WITH(unixODBC-libs,
+     [  --with-unixODBC-libs=DIR Find unixODBC libraries in DIR],
+     unixODBC_libs="$withval",unixODBC_libs="$unixODBC/lib")
+ 
+     CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
+     AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
+         unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr",unixODBC_ok=no; break)
+ 
+ if test "x$unixODBC_ok" != "xyes"
+ then
+     AC_MSG_ERROR([Unable to find the unixODBC headers in $1])
+ fi
+ 
+ save_LIBS="$LIBS"
+ LIBS="-L$unixODBC_libs $LIBS"
+ 
+ AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
+ [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
+ LIBS="$LIBS -lodbcinst"],
+ [LIBS="$save_LIBS"])
+ fi
+ 
dnl Unless we specify the command line options
diff -c -r -p1 ../pgsql/src/include/config.h.in ./src/include/config.h.in
*** ../pgsql/src/include/config.h.in	Mon Feb 21 08:00:25 2000
--- ./src/include/config.h.in	Thu Mar  2 16:42:58 2000
***************
*** 310,311 ****
--- 310,314 ----

+ /* are we building against a libodbcinst */
+ #undef HAVE_SQLGETPRIVATEPROFILESTRING
+ 
/* Set to 1 if you have <pwd.h> */
diff -c -r -p1 ../pgsql/src/interfaces/odbc/dlg_specific.c ./src/interfaces/odbc/dlg_specific.c
*** ../pgsql/src/interfaces/odbc/dlg_specific.c	Tue Nov 30 08:00:26 1999
--- ./src/interfaces/odbc/dlg_specific.c	Thu Mar  2 16:43:40 2000
***************
*** 25,28 ****
--- 25,30 ----
#include "gpps.h"
+ #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
+ #endif
#ifndef HAVE_STRICMP
diff -c -r -p1 ../pgsql/src/interfaces/odbc/misc.h ./src/interfaces/odbc/misc.h
*** ../pgsql/src/interfaces/odbc/misc.h	Thu Dec 31 00:26:44 1998
--- ./src/interfaces/odbc/misc.h	Thu Mar  2 16:43:23 2000
***************
*** 17,20 ****
#ifndef WIN32
! #include "gpps.h"
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#endif
--- 17,21 ----
#ifndef WIN32
! #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
+ #endif
#endif

--
Peter Eisentraut Sernanders v�g 10:115
peter_e@gmx.net 75262 Uppsala
http://yi.org/peter-e/ Sweden

I am glad to back it out if you wish, or you can do it.

[ Charset ISO-8859-1 unsupported, converting... ]

Sorry, I'm going to have to remove this. It breaks the build for those
*not* using unixODBC. (Nice marketing move, but really... :)

Bruce Momjian writes:

Sorry. Found your nice diff. Applied. Thanks.

Hello.

I have made the couple of mods required to make the odbc driver with
postgres build and use unixODBC (http://www.unixodbc.org)

This patch was applied against the postgresql-7.0beta1 build

Any problems let me know.

Nick Gorham

Only in .: pg-beta-unixODBC.patch
diff -c -r -p1 ../pgsql/src/configure.in ./src/configure.in
*** ../pgsql/src/configure.in	Mon Feb 21 08:00:25 2000
--- ./src/configure.in	Thu Mar  2 16:42:40 2000
*************** AC_SUBST(ODBCINSTDIR)
*** 391,392 ****
--- 391,434 ----

+ #check for unixODBC
+ 
+ use_unixODBC=no
+ AC_ARG_WITH(unixODBC,
+ [  --with-unixODBC[=DIR]   Use unixODBC located in DIR],
+ [use_unixODBC=yes;unixODBC="$withval"],use_unixODBC=no)
+ 
+ if test "x$use_unixODBC" = "xyes"
+ then
+ 
+ # default to /usr if not specified
+ if test "x$unixODBC" = "x"
+ then
+     unixODBC="/usr";
+ fi
+ 
+ AC_ARG_WITH(unixODBC-includes,
+     [  --with-unixODBC-includes=DIR Find unixODBC headers in DIR],
+     unixODBC_includes="$withval",unixODBC_includes="$unixODBC/include")
+ 
+     AC_ARG_WITH(unixODBC-libs,
+     [  --with-unixODBC-libs=DIR Find unixODBC libraries in DIR],
+     unixODBC_libs="$withval",unixODBC_libs="$unixODBC/lib")
+ 
+     CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"
+     AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,
+         unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr",unixODBC_ok=no; break)
+ 
+ if test "x$unixODBC_ok" != "xyes"
+ then
+     AC_MSG_ERROR([Unable to find the unixODBC headers in $1])
+ fi
+ 
+ save_LIBS="$LIBS"
+ LIBS="-L$unixODBC_libs $LIBS"
+ 
+ AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,
+ [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)
+ LIBS="$LIBS -lodbcinst"],
+ [LIBS="$save_LIBS"])
+ fi
+ 
dnl Unless we specify the command line options
diff -c -r -p1 ../pgsql/src/include/config.h.in ./src/include/config.h.in
*** ../pgsql/src/include/config.h.in	Mon Feb 21 08:00:25 2000
--- ./src/include/config.h.in	Thu Mar  2 16:42:58 2000
***************
*** 310,311 ****
--- 310,314 ----

+ /* are we building against a libodbcinst */
+ #undef HAVE_SQLGETPRIVATEPROFILESTRING
+ 
/* Set to 1 if you have <pwd.h> */
diff -c -r -p1 ../pgsql/src/interfaces/odbc/dlg_specific.c ./src/interfaces/odbc/dlg_specific.c
*** ../pgsql/src/interfaces/odbc/dlg_specific.c	Tue Nov 30 08:00:26 1999
--- ./src/interfaces/odbc/dlg_specific.c	Thu Mar  2 16:43:40 2000
***************
*** 25,28 ****
--- 25,30 ----
#include "gpps.h"
+ #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)
+ #endif
#ifndef HAVE_STRICMP
diff -c -r -p1 ../pgsql/src/interfaces/odbc/misc.h ./src/interfaces/odbc/misc.h
*** ../pgsql/src/interfaces/odbc/misc.h	Thu Dec 31 00:26:44 1998
--- ./src/interfaces/odbc/misc.h	Thu Mar  2 16:43:23 2000
***************
*** 17,20 ****
#ifndef WIN32
! #include "gpps.h"
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
#endif
--- 17,21 ----
#ifndef WIN32
! #ifndef HAVE_SQLGETPRIVATEPROFILESTRING
#define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)
+ #endif
#endif

--
Peter Eisentraut Sernanders v?g 10:115
peter_e@gmx.net 75262 Uppsala
http://yi.org/peter-e/ Sweden

-- 
  Bruce Momjian                        |  http://www.op.net/~candle
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026

Applied and renamed to HAVE_SEL_GET_PRIV_PROFILE.

Bruce Momjian wrote:

I am glad to back it out if you wish, or you can do it.

[ Charset ISO-8859-1 unsupported, converting... ]

Sorry, I'm going to have to remove this. It breaks the build for those
*not* using unixODBC. (Nice marketing move, but really... :)

Sorry, its a missing n in misc.h and dlg_specific.c

in the line

#ifdef HAVE_SQLGETPRIVATEPROFILESTRING

should be

#ifndef HAVE_SQLGETPRIVATEPROFILESTRING

Unless I have missed something else as well.

--
To me vi is Zen. To use vi is to practice zen. Every command is
a koan. Profound to the user, unintelligible to the uninitiated.
You discover truth everytime you use it.
-- reddy@lion.austin.ibm.com

-- 
  Bruce Momjian                        |  http://www.op.net/~candle
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026

Naa, that just makes things worse because now it won't work for unixODBC
either. I had to remove this for now. I'll look through Nick's original
patches and see how I can merge them in.

Btw., one thing I don't understand is this: Aren't psqlodbc and unixodbc
essentially products with the same functionality? If so, how is linking
one with the other meaningful? If not, what are they?

Bruce Momjian writes:

Applied and renamed to HAVE_SEL_GET_PRIV_PROFILE.

Bruce Momjian wrote:

I am glad to back it out if you wish, or you can do it.

[ Charset ISO-8859-1 unsupported, converting... ]

Sorry, I'm going to have to remove this. It breaks the build for those
*not* using unixODBC. (Nice marketing move, but really... :)

Sorry, its a missing n in misc.h and dlg_specific.c

in the line

#ifdef HAVE_SQLGETPRIVATEPROFILESTRING

should be

#ifndef HAVE_SQLGETPRIVATEPROFILESTRING

Unless I have missed something else as well.

--
To me vi is Zen. To use vi is to practice zen. Every command is
a koan. Profound to the user, unintelligible to the uninitiated.
You discover truth everytime you use it.
-- reddy@lion.austin.ibm.com

--
Peter Eisentraut Sernanders v�g 10:115
peter_e@gmx.net 75262 Uppsala
http://yi.org/peter-e/ Sweden

Nick Gorham writes:

The only thing that I am trying to do with the --with-unixODBC flag is
to make the driver use the SQLGetPrivateProfileString from the
libodbcinst.so provided by unixODBC. This way avoids the multiple
odbc.ini entries that can happen. Also it enables the GUI config tool
to setup DSN entries that can be used by the driver, as they use the
same odbcinst lib.

Sounds good. It's also nice to know this to put it in the documentation
somewhere. I'm downloading unixODBC just now to test my incarnation of
your patch.

--
Peter Eisentraut Sernanders v�g 10:115
peter_e@gmx.net 75262 Uppsala
http://yi.org/peter-e/ Sweden