mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Nick Gorham
Easysoft Ltd
This commit is contained in:
Bruce Momjian 2000-06-14 02:43:46 +00:00
parent 4b3d31c991
commit d1b90bfd45
2 changed files with 1 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
configure.in
View File

@ -488,111 +488,6 @@ then
fi fi
export SHLIB_ODBC export SHLIB_ODBC
#check for unixODBC libs
if test "x$use_unixODBC" = "xyes"
then
# default to /usr/local if not specified
if test "x$unixODBC" = "x"
then
unixODBC="/usr/local";
fi
unixODBC_libs="$unixODBC/lib"
unixODBC_includes="$unixODBC/include"
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 )
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)
SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],
[LIBS="$save_LIBS"] )
fi
export SHLIB_ODBC
#check for unixODBC libs
if test "x$use_unixODBC" = "xyes"
then
# default to /usr/local if not specified
if test "x$unixODBC" = "x"
then
unixODBC="/usr/local";
fi
unixODBC_libs="$unixODBC/lib"
unixODBC_includes="$unixODBC/include"
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 )
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)
SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],
[LIBS="$save_LIBS"] )
fi
export SHLIB_ODBC
#check for unixODBC libs
if test "x$use_unixODBC" = "xyes"
then
# default to /usr/local if not specified
if test "x$unixODBC" = "x"
then
unixODBC="/usr/local";
fi
unixODBC_libs="$unixODBC/lib"
unixODBC_includes="$unixODBC/include"
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 )
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)
SHLIB_ODBC="$LDFLAGS_ODBC -L$unixODBC_libs -lodbcinst" ],
[LIBS="$save_LIBS"] )
fi
export SHLIB_ODBC
dnl Unless we specify the command line options dnl Unless we specify the command line options
dnl --enable cassert to explicitly enable it dnl --enable cassert to explicitly enable it
dnl If you do not explicitly do it, it defaults to disabled dnl If you do not explicitly do it, it defaults to disabled

3
src/interfaces/odbc/GNUmakefile.in
View File

@ -7,10 +7,9 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.14 2000/06/12 17:58:20 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile.in,v 1.15 2000/06/14 02:43:46 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@SET_MAKE@
NAME = psqlodbc NAME = psqlodbc
SRCDIR= ../.. SRCDIR= ../..