NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3fe3acb

committed

I have made the couple of mods required to make the odbc driver withpostgres build and use unixODBC (http://www.unixodbc.org)This patch was applied against the postgresql-7.0beta1 buildAny problems let me know.Nick Gorham

1 parent85add42 commit3fe3acbCopy full SHA for 3fe3acb

File tree

5 files changed

+51

-3

lines changed

configure.in
doc
- TODO
src
- include
  - config.h.in
- interfaces/odbc
  - dlg_specific.c
  - misc.h

5 files changed

+51

-3

lines changed

`‎configure.in`

Lines changed: 42 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -396,6 +396,48 @@ then`
`396`	`396`	`fi`
`397`	`397`	`AC_SUBST(ODBCINSTDIR)`
`398`	`398`
	`399`	`+#check for unixODBC`
	`400`	`+`
	`401`	`+use_unixODBC=no`
	`402`	`+AC_ARG_WITH(unixODBC,`
	`403`	`+[ --with-unixODBC[=DIR] Use unixODBC located in DIR],`
	`404`	`+[use_unixODBC=yes;unixODBC="$withval"],use_unixODBC=no)`
	`405`	`+`
	`406`	`+if test "x$use_unixODBC" = "xyes"`
	`407`	`+then`
	`408`	`+`
	`409`	`+# default to /usr if not specified`
	`410`	`+if test "x$unixODBC" = "x"`
	`411`	`+then`
	`412`	`+ unixODBC="/usr";`
	`413`	`+fi`
	`414`	`+`
	`415`	`+AC_ARG_WITH(unixODBC-includes,`
	`416`	`+ [ --with-unixODBC-includes=DIR Find unixODBC headers in DIR],`
	`417`	`+ unixODBC_includes="$withval",unixODBC_includes="$unixODBC/include")`
	`418`	`+`
	`419`	`+ AC_ARG_WITH(unixODBC-libs,`
	`420`	`+ [ --with-unixODBC-libs=DIR Find unixODBC libraries in DIR],`
	`421`	`+ unixODBC_libs="$withval",unixODBC_libs="$unixODBC/lib")`
	`422`	`+`
	`423`	`+ CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"`
	`424`	`+ AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,`
	`425`	`+ unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr",unixODBC_ok=no; break)`
	`426`	`+`
	`427`	`+if test "x$unixODBC_ok" != "xyes"`
	`428`	`+then`
	`429`	`+ AC_MSG_ERROR([Unable to find the unixODBC headers in $1])`
	`430`	`+fi`
	`431`	`+`
	`432`	`+save_LIBS="$LIBS"`
	`433`	`+LIBS="-L$unixODBC_libs $LIBS"`
	`434`	`+`
	`435`	`+AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,`
	`436`	`+[AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)`
	`437`	`+LIBS="$LIBS -lodbcinst"],`
	`438`	`+[LIBS="$save_LIBS"])`
	`439`	`+fi`
	`440`	`+`
`399`	`441`	`dnl Unless we specify the command line options`
`400`	`442`	`dnl--enable cassertto explicitly enable it`
`401`	`443`	`dnl If you do not explicitly do it, it defaults to disabled`

`‎doc/TODO`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ URGENT`
`63`	`63`
`64`	`64`	`ADMIN`
`65`	`65`
`66`		`-* More access control over who can create tables andaccess the database`
	`66`	`+*-More access control over who can create tables anduse locks(Karal)`
`67`	`67`	`* Test syslog functionality`
`68`	`68`	`* Allow elog() to return error codes, not just messages`
`69`	`69`	`* Allow international error message support and add error codes`

`‎src/include/config.h.in`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* or in config.h afterwards. Of course, if you edit config.h, then your`
`9`	`9`	`* changes will be overwritten the next time you run configure.`
`10`	`10`	`*`
`11`		`- * $Id: config.h.in,v 1.116 2000/06/04 15:06:32 petere Exp $`
	`11`	`+ * $Id: config.h.in,v 1.117 2000/06/09 16:03:07 momjian Exp $`
`12`	`12`	`*/`
`13`	`13`
`14`	`14`	`#ifndefCONFIG_H`
`@@ -305,6 +305,9 @@`
`305`	`305`	`* Block of parameters for the ODBC code.`
`306`	`306`	`*/`
`307`	`307`
	`308`	`+/* are we building against a libodbcinst */`
	`309`	`+#undef HAVE_SQLGETPRIVATEPROFILESTRING`
	`310`	`+`
`308`	`311`	`/* Set to 1 if you have <pwd.h> */`
`309`	`312`	`#undef HAVE_PWD_H`
`310`	`313`

`‎src/interfaces/odbc/dlg_specific.c`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,10 @@`
`23`	`23`	`#ifndefWIN32`
`24`	`24`	`#include<string.h>`
`25`	`25`	`#include"gpps.h"`
	`26`	`+#ifndefHAVE_SQLGETPRIVATEPROFILESTRING`
`26`	`27`	`#defineSQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)`
`27`	`28`	`#defineSQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d)`
	`29`	`+#endif`
`28`	`30`	`#ifndefHAVE_STRICMP`
`29`	`31`	`#definestricmp(s1,s2)strcasecmp(s1,s2)`
`30`	`32`	`#definestrnicmp(s1,s2,n)strncasecmp(s1,s2,n)`

`‎src/interfaces/odbc/misc.h`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,10 @@`
`15`	`15`	`#endif`
`16`	`16`
`17`	`17`	`#ifndefWIN32`
`18`		`-#include"gpps.h"`
	`18`	`+#ifndefHAVE_SQLGETPRIVATEPROFILESTRING`
`19`	`19`	`#defineSQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f)`
`20`	`20`	`#endif`
	`21`	`+#endif`
`21`	`22`
`22`	`23`	`#include<stdio.h>`
`23`	`24`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3fe3acb

File tree

5 files changed

5 files changed

`‎configure.in`

`‎doc/TODO`

`‎src/include/config.h.in`

`‎src/interfaces/odbc/dlg_specific.c`

`‎src/interfaces/odbc/misc.h`

0 commit comments