NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd1b90bf

committed

OK, I have tidied up todays (13th) snapshot with the attached patch, I

have'nt r un autoconf to create a new configure, I guess that's done bythe smapshot process, I had to remove a line from interface/odbc/GNUMakefile to get it to build, it was a autoconf variable that looks tonot be used anymore, I am assuming that this is ok.Nick GorhamEasysoft Ltd

1 parent4b3d31c commitd1b90bfCopy full SHA for d1b90bf

File tree

2 files changed

-107

lines changed

configure.in
src/interfaces/odbc
- GNUmakefile.in

2 files changed

-107

lines changed

`‎configure.in`

Lines changed: 0 additions & 105 deletions

Original file line number	Diff line number	Diff line change
`@@ -488,111 +488,6 @@ then`
`488`	`488`	`fi`
`489`	`489`	`export SHLIB_ODBC`
`490`	`490`
`491`		`-#check for unixODBC libs`
`492`		`-`
`493`		`-if test "x$use_unixODBC" = "xyes"`
`494`		`-then`
`495`		`-`
`496`		`- # default to /usr/local if not specified`
`497`		`- if test "x$unixODBC" = "x"`
`498`		`- then`
`499`		`- unixODBC="/usr/local";`
`500`		`- fi`
`501`		`-`
`502`		`- unixODBC_libs="$unixODBC/lib"`
`503`		`- unixODBC_includes="$unixODBC/include"`
`504`		`-`
`505`		`- CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"`
`506`		`- AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,`
`507`		`- unixODBC_ok=yes;`
`508`		`- odbc_headers="$odbc_headers $ac_hdr",`
`509`		`- unixODBC_ok=no )`
`510`		`-`
`511`		`- if test "x$unixODBC_ok" != "xyes"`
`512`		`- then`
`513`		`- AC_MSG_ERROR([Unable to find the unixODBC headers in $1])`
`514`		`- fi`
`515`		`-`
`516`		`- save_LIBS="$LIBS"`
`517`		`- LIBS="-L$unixODBC_libs $LIBS"`
`518`		`-`
`519`		`- AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,`
`520`		`- [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)`
`521`		`- SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],`
`522`		`- [LIBS="$save_LIBS"] )`
`523`		`-fi`
`524`		`-export SHLIB_ODBC`
`525`		`-`
`526`		`-#check for unixODBC libs`
`527`		`-`
`528`		`-if test "x$use_unixODBC" = "xyes"`
`529`		`-then`
`530`		`-`
`531`		`- # default to /usr/local if not specified`
`532`		`- if test "x$unixODBC" = "x"`
`533`		`- then`
`534`		`- unixODBC="/usr/local";`
`535`		`- fi`
`536`		`-`
`537`		`- unixODBC_libs="$unixODBC/lib"`
`538`		`- unixODBC_includes="$unixODBC/include"`
`539`		`-`
`540`		`- CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"`
`541`		`- AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,`
`542`		`- unixODBC_ok=yes;`
`543`		`- odbc_headers="$odbc_headers $ac_hdr",`
`544`		`- unixODBC_ok=no )`
`545`		`-`
`546`		`- if test "x$unixODBC_ok" != "xyes"`
`547`		`- then`
`548`		`- AC_MSG_ERROR([Unable to find the unixODBC headers in $1])`
`549`		`- fi`
`550`		`-`
`551`		`- save_LIBS="$LIBS"`
`552`		`- LIBS="-L$unixODBC_libs $LIBS"`
`553`		`-`
`554`		`- AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,`
`555`		`- [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)`
`556`		`- SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],`
`557`		`- [LIBS="$save_LIBS"] )`
`558`		`-fi`
`559`		`-export SHLIB_ODBC`
`560`		`-`
`561`		`-#check for unixODBC libs`
`562`		`-`
`563`		`-if test "x$use_unixODBC" = "xyes"`
`564`		`-then`
`565`		`-`
`566`		`- # default to /usr/local if not specified`
`567`		`- if test "x$unixODBC" = "x"`
`568`		`- then`
`569`		`- unixODBC="/usr/local";`
`570`		`- fi`
`571`		`-`
`572`		`- unixODBC_libs="$unixODBC/lib"`
`573`		`- unixODBC_includes="$unixODBC/include"`
`574`		`-`
`575`		`- CPPFLAGS="$CPPFLAGS -I$unixODBC_includes"`
`576`		`- AC_CHECK_HEADERS(sql.h sqlext.h odbcinst.h,`
`577`		`- unixODBC_ok=yes;`
`578`		`- odbc_headers="$odbc_headers $ac_hdr",`
`579`		`- unixODBC_ok=no )`
`580`		`-`
`581`		`- if test "x$unixODBC_ok" != "xyes"`
`582`		`- then`
`583`		`- AC_MSG_ERROR([Unable to find the unixODBC headers in $1])`
`584`		`- fi`
`585`		`-`
`586`		`- save_LIBS="$LIBS"`
`587`		`- LIBS="-L$unixODBC_libs $LIBS"`
`588`		`-`
`589`		`- AC_CHECK_LIB(odbcinst,SQLGetPrivateProfileString,`
`590`		`- [AC_DEFINE(HAVE_SQLGETPRIVATEPROFILESTRING)`
`591`		`- SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],`
`592`		`- [LIBS="$save_LIBS"] )`
`593`		`-fi`
`594`		`-export SHLIB_ODBC`
`595`		`-`
`596`	`491`	`dnl Unless we specify the command line options`
`597`	`492`	`dnl--enable cassertto explicitly enable it`
`598`	`493`	`dnl If you do not explicitly do it, it defaults to disabled`

`‎src/interfaces/odbc/GNUmakefile.in`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,9 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.14 2000/06/12 17:58:20 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.15 2000/06/14 02:43:46 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`		`-@SET_MAKE@`
`14`	`13`
`15`	`14`	`NAME = psqlodbc`
`16`	`15`	`SRCDIR= ../..`

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!

Commitd1b90bf

File tree

2 files changed

2 files changed

`‎configure.in`

`‎src/interfaces/odbc/GNUmakefile.in`

0 commit comments